Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Aug 2009 22:28:23 +0000 (15:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Aug 2009 22:28:23 +0000 (15:28 -0700)
commit624720e09c9b7913ef4bc6989878a6fcb7ecdff8
treebe36dc1fc45a4cf5d5100ca5252e6aa3b465fbe2
parent849c9caa60642095060e9c21f14687ae9149a6f3
parent01a261e09a21e0ba342d3907a79cf5c78ee3f37a
Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: fix missing unlock in error path of nilfs_mdt_write_page
  nilfs2: fix oops due to inconsistent state in page with discrete b-tree nodes