From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 May 2014 16:38:07 +0000 (-0700)
Subject: Merge branch 'akpm' (incoming from Andrew)
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fc3ac5c75bae55ca6a070eb72038a94d4f130d8d;p=deliverable%2Flinux.git

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
---

fc3ac5c75bae55ca6a070eb72038a94d4f130d8d