diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-23 09:38:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-23 09:38:07 -0700 |
commit | fc3ac5c75bae55ca6a070eb72038a94d4f130d8d (patch) | |
tree | 9ff7417bda4655bafa961bebf600ea6fd0cab8a4 /kernel | |
parent | 9abd09acd664c68f06242da191209d9c70df6953 (diff) | |
parent | 0d9327ab70038ac8c7af6e20456578ab80158f2d (diff) | |
download | linux-fc3ac5c75bae55ca6a070eb72038a94d4f130d8d.tar.gz linux-fc3ac5c75bae55ca6a070eb72038a94d4f130d8d.tar.bz2 linux-fc3ac5c75bae55ca6a070eb72038a94d4f130d8d.zip |
Merge branch 'akpm' (incoming from Andrew)
Merge misc fixes from Andrew Morton:
"9 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
MAINTAINERS: add closing angle bracket to Vince Bridgers' email address
Documentation: fix DOCBOOKS=... building
ocfs2: fix double kmem_cache_destroy in dlm_init
mm/memory-failure.c: fix memory leak by race between poison and unpoison
wait: swap EXIT_ZOMBIE(Z) and EXIT_DEAD(X) chars in TASK_STATE_TO_CHAR_STR
memcg: fix swapcache charge from kernel thread context
mm: madvise: fix MADV_WILLNEED on shmem swapouts
mm/filemap.c: avoid always dirtying mapping->flags on O_DIRECT
hwpoison, hugetlb: lock_page/unlock_page does not match for handling a free hugepage
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions