Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6
Linus Torvalds [Wed, 16 Jul 2008 22:02:57 +0000 (15:02 -0700)]
* 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6:
  UBIFS: include to compilation
  UBIFS: add new flash file system
  UBIFS: add brief documentation
  MAINTAINERS: add UBIFS section
  do_mounts: allow UBI root device name
  VFS: export sync_sb_inodes
  VFS: move inode_lock into sync_sb_inodes

1  2 
MAINTAINERS
fs/Kconfig
fs/Makefile
include/linux/fs.h

diff --cc MAINTAINERS
Simple merge
diff --cc fs/Kconfig
Simple merge
diff --cc fs/Makefile
Simple merge
Simple merge