diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-31 23:58:23 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-31 23:58:23 (GMT) |
commit | 4f794ee8c40119366e0be45f9d49e7ff1a89b79b (patch) | |
tree | 137eccc7d99cb71f4ae11568df0eaa909cbb7529 /fs/ext3 | |
parent | 358eec18243ac025b2eb0317ab52bd247e1b03c6 (diff) | |
parent | 3d77b50c5874b7e923be946ba793644f82336b75 (diff) | |
download | linux-4f794ee8c40119366e0be45f9d49e7ff1a89b79b.tar.xz |
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
Diffstat (limited to 'fs/ext3')
0 files changed, 0 insertions, 0 deletions