Merge branch 'master' into gfs2

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc fs/Kconfig
index c968b9c7e58194fd9e3b32812c962099286f5a5b,1453d2d164f7c2d5a94e5da75d41dbba9d94a66e..fa64867d6ed64feb339a0b37d97a929dca723ca3
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -1948,9 -1980,9 +1981,10 @@@ menu "Partition Types
  source "fs/partitions/Kconfig"
  
  endmenu
+ endif
  
  source "fs/nls/Kconfig"
 +source "fs/dlm/Kconfig"
  
  endmenu
  

diff --cc fs/Makefile
Simple merge

diff --cc include/linux/Kbuild
Simple merge

diff --cc mm/filemap.c
Simple merge