Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Nov 2009 17:15:18 +0000 (09:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Nov 2009 17:15:18 +0000 (09:15 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: deleted inconsistent comment in nilfs_load_inode_block()
  nilfs2: deleted struct nilfs_dat_group_desc
  nilfs2: fix lock order reversal in chcp operation


Trivial merge