Merge branch 'master' into gfs2
Steven Whitehouse [Mon, 2 Oct 2006 12:45:08 +0000 (08:45 -0400)]
1  2 
CREDITS
MAINTAINERS
fs/Kconfig
fs/Makefile
include/linux/Kbuild
mm/filemap.c

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc 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
Simple merge
diff --cc mm/filemap.c
Simple merge