tree bdafbd1d1030a1d4717b52d07d8d0c3a37e8a693
parent cb20c28a9c41052c2d7220325dae60c16f417ded
parent 18dafac1a4c6c88867a50f9a82492976f20383d6
author Linus Torvalds <torvalds@linux-foundation.org> 1258478118 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258478118 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2

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