From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 31 Oct 2013 23:58:23 +0000 (-0700)
Subject: Merge branch 'akpm' (fixes from Andrew Morton)
X-Git-Tag: v3.12~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4f794ee8c40119366e0be45f9d49e7ff1a89b79b;p=linux.git

Merge branch 'akpm' (fixes from Andrew Morton)

Merge four more fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  lib/scatterlist.c: don't flush_kernel_dcache_page on slab page
  mm: memcg: fix test for child groups
  mm: memcg: lockdep annotation for memcg OOM lock
  mm: memcg: use proper memcg in limit bypass
---

4f794ee8c40119366e0be45f9d49e7ff1a89b79b