Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Aug 2009 17:40:24 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Aug 2009 17:40:24 +0000 (10:40 -0700)
commit6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f
treeb840fbfc5453d307ff9211f0b0e5015dc9e5a345
parent0dc9aa845c20ed1f46c85f229591b811dffc4b3b
parenta924586036833086b262a371b09d1266c23bb4d1
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 oopses with doubly mounted snapshots
  nilfs2: missing a read lock for segment writer in nilfs_attach_checkpoint()