tree 4a892a01cd844f574566b8b3381aab03edb4dea2
parent 50f3515828024582402044bcced6804c070c491c
parent af71dda0b8e667d03eec21d25f90265eec5efea1
author Linus Torvalds <torvalds@linux-foundation.org> 1301503596 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1301503596 -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 whitespace coding style issues
  nilfs2: fix oops due to a bad aops initialization
  nilfs2: fix data loss in mmap page write for hole blocks