Merge branch 'master'
Steven Whitehouse [Thu, 25 May 2006 16:40:08 +0000 (12:40 -0400)]
1  2 
CREDITS
MAINTAINERS
fs/Makefile
include/linux/fs.h
include/linux/kernel.h

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc 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/
Simple merge
Simple merge