aboutsummaryrefslogtreecommitdiffstats
path: root/net/switchdev/switchdev.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2015-02-17 21:20:42 +0000
committerLinus Torvalds <[email protected]>2015-02-17 21:20:42 +0000
commit1d9e71404e2c3f37387991534983dcb2ab05660d (patch)
treedaddf50cdd0cbf0727bf83e33caf1839c988389e /net/switchdev/switchdev.c
parentMerge tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentMerge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/k... (diff)
downloadkernel-1d9e71404e2c3f37387991534983dcb2ab05660d.tar.gz
kernel-1d9e71404e2c3f37387991534983dcb2ab05660d.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem fixes from James Morris. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: Don't leak a key reference if request_key() tries to use a revoked keyring Added Little Endian support to vtpm module tpm, tpm_tis: fix TPM 2.0 probing tpm: fix suspend/resume paths for TPM 2.0 Smack: secmark connections
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions