tree b840fbfc5453d307ff9211f0b0e5015dc9e5a345
parent 0dc9aa845c20ed1f46c85f229591b811dffc4b3b
parent a924586036833086b262a371b09d1266c23bb4d1
author Linus Torvalds <torvalds@linux-foundation.org> 1250703624 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1250703624 -0700

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: fix oopses with doubly mounted snapshots
  nilfs2: missing a read lock for segment writer in nilfs_attach_checkpoint()