tree 137eccc7d99cb71f4ae11568df0eaa909cbb7529
parent 358eec18243ac025b2eb0317ab52bd247e1b03c6
parent 3d77b50c5874b7e923be946ba793644f82336b75
author Linus Torvalds <torvalds@linux-foundation.org> 1383263903 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1383263903 -0700

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