Merge branch 'akpm-current/current'

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc block/blk-settings.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc include/linux/bitmap.h
index 73d039476fa490b2a0c76e6d467e2a05283bf9e5,f57f4473bbe495e2a8622e014cd4cc2c4d2d2ca8..a36cfcec4e779d0361afc2610e1569eabcbf279e
--- 1/include/linux/bitmap.h
--- 2/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@@ -4,12 -4,11 +4,13 @@@
  
  #ifndef __ASSEMBLY__
  
 -#include <linux/types.h>
+ #include <linux/align.h>
  #include <linux/bitops.h>
- #include <linux/kernel.h>
+ #include <linux/limits.h>
  #include <linux/string.h>
 +#include <linux/types.h>
 +
 +struct device;
  
  /*
   * bitmaps provide bit arrays that consume one or more unsigned

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/compat.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc init/main.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc mm/memory.c
Simple merge