commit | 7926e0bfbbc5ff81ddad0fda831eef7060e40997 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 05 07:31:13 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 05 07:31:13 2010 -0700 |
tree | f2ca535b4d35c83262e05bb9d1cdeb22c59987d6 | |
parent | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 [diff] | |
parent | c29684d6834af7b3792f2feb6bdcf8c906ad8db6 [diff] |
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: remove obsolete declarations of cache constructor and destructor nilfs2: fix style issue in nilfs_destroy_cachep