From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Aug 2009 22:28:23 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke... 
X-Git-Tag: MMI-PSA29.97-13-9~27236
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=624720e09c9b7913ef4bc6989878a6fcb7ecdff8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

624720e09c9b7913ef4bc6989878a6fcb7ecdff8