Merge branch 'master'

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc fs/Makefile
index 2c22e282c777e52106df005afb530f5d2d28f73c,078d3d1191a511f3ad88ac0167142fda8c10c5a9..c731d2c0f409755ff11229b418e58dbbda7be9f6
--- 1/fs/Makefile
--- 2/fs/Makefile
+++ b/fs/Makefile
@@@ -101,6 -101,4 +102,5 @@@ obj-$(CONFIG_BEFS_FS)              += befs
  obj-$(CONFIG_HOSTFS)          += hostfs/
  obj-$(CONFIG_HPPFS)           += hppfs/
  obj-$(CONFIG_DEBUG_FS)                += debugfs/
- obj-$(CONFIG_CONFIGFS_FS)     += configfs/
  obj-$(CONFIG_OCFS2_FS)                += ocfs2/
 +obj-$(CONFIG_GFS2_FS)           += gfs2/

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

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