Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jun 2010 14:31:13 +0000 (07:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jun 2010 14:31:13 +0000 (07:31 -0700)
commit7926e0bfbbc5ff81ddad0fda831eef7060e40997
treef2ca535b4d35c83262e05bb9d1cdeb22c59987d6
parent7f0d384cafabfbb56663ee6944c18fc0450fc5d6
parentc29684d6834af7b3792f2feb6bdcf8c906ad8db6
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: remove obsolete declarations of cache constructor and destructor
  nilfs2: fix style issue in nilfs_destroy_cachep