aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-09 13:30:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-09 13:30:14 -0700
commit4047df09a1581284218cb378208a87eaa36f2d2c (patch)
tree16e0f13b10d68f645b545a1c919714c66f75b863 /net/8021q
parenta372bf8b6a12f23f68e716113ccaea4bf646dd0f (diff)
parent36520be8e32b49bd85a63b7b8b40cd07c3da59a5 (diff)
downloadkernel_samsung_espresso10-4047df09a1581284218cb378208a87eaa36f2d2c.zip
kernel_samsung_espresso10-4047df09a1581284218cb378208a87eaa36f2d2c.tar.gz
kernel_samsung_espresso10-4047df09a1581284218cb378208a87eaa36f2d2c.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6: ima: ecryptfs fix imbalance message eCryptfs: Remove Kconfig NET dependency and select MD5 ecryptfs: depends on CRYPTO
Diffstat (limited to 'net/8021q')
0 files changed, 0 insertions, 0 deletions