tree 01210aba49c120116bb99ba031ff86a525ffb63d
parent 42fdd144a40f3afaccaa7ea538268bad3596439e
parent 0d7eff873caaeac84de01a1acdca983d2c7ba3fe
author Linus Torvalds <torvalds@linux-foundation.org> 1216245777 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216245777 -0700

Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

* '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