Merge branch 'akpm' (updates from Andrew Morton)

Merge second patch-bomb from Andrew Morton:
 - misc fixes
 - audit stuff
 - fanotify/inotify/dnotify things
 - most of the rest of MM.  The new cache shrinker code from Glauber and
   Dave Chinner probably isn't quite stabilized yet.
 - ptrace
 - ipc
 - partitions
 - reboot cleanups
 - add LZ4 decompressor, use it for kernel compression

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
  lib/scatterlist: error handling in __sg_alloc_table()
  scsi_debug: fix do_device_access() with wrap around range
  crypto: talitos: use sg_pcopy_to_buffer()
  lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer()
  lib/scatterlist: factor out sg_miter_get_next_page() from sg_miter_next()
  crypto: add lz4 Cryptographic API
  lib: add lz4 compressor module
  arm: add support for LZ4-compressed kernel
  lib: add support for LZ4-compressed kernel
  decompressor: add LZ4 decompressor module
  lib: add weak clz/ctz functions
  reboot: move arch/x86 reboot= handling to generic kernel
  reboot: arm: change reboot_mode to use enum reboot_mode
  reboot: arm: prepare reboot_mode for moving to generic kernel code
  reboot: arm: remove unused restart_mode fields from some arm subarchs
  reboot: unicore32: prepare reboot_mode for moving to generic kernel code
  reboot: x86: prepare reboot_mode for moving to generic kernel code
  reboot: checkpatch.pl the new kernel/reboot.c file
  reboot: move shutdown/reboot related functions to kernel/reboot.c
  reboot: remove -stable friendly PF_THREAD_BOUND define
  ...

1 files changed, 13 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e03c40eb39e0..9623bc5a39d5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9268,6 +9268,13 @@ F:	Documentation/networking/z8530drv.txt
 F:      drivers/net/hamradio/*scc.c
 F:      drivers/net/hamradio/z8530.h
 
+ZBUD COMPRESSED PAGE ALLOCATOR
+M:      Seth Jennings <sjenning@linux.vnet.ibm.com>
+L:      linux-mm@kvack.org
+S:      Maintained
+F:      mm/zbud.c
+F:      include/linux/zbud.h
+
 ZD1211RW WIRELESS DRIVER
 M:      Daniel Drake <dsd@gentoo.org>
 M:      Ulrich Kunitz <kune@deine-taler.de>
@@ -9290,6 +9297,12 @@ M:	"Maciej W. Rozycki" <macro@linux-mips.org>
 S:      Maintained
 F:      drivers/tty/serial/zs.*
 
+ZSWAP COMPRESSED SWAP CACHING
+M:      Seth Jennings <sjenning@linux.vnet.ibm.com>
+L:      linux-mm@kvack.org
+S:      Maintained
+F:      mm/zswap.c
+
 THE REST
 M:      Linus Torvalds <torvalds@linux-foundation.org>
 L:      linux-kernel@vger.kernel.org