summaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-05 07:31:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-05 07:31:13 -0700
commit7926e0bfbbc5ff81ddad0fda831eef7060e40997 (patch)
treef2ca535b4d35c83262e05bb9d1cdeb22c59987d6 /net/xfrm
parent7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (diff)
parentc29684d6834af7b3792f2feb6bdcf8c906ad8db6 (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
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions