Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2015 21:20:42 +0000 (13:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2015 21:20:42 +0000 (13:20 -0800)
commit1d9e71404e2c3f37387991534983dcb2ab05660d
treedaddf50cdd0cbf0727bf83e33caf1839c988389e
parentcc4f9c2a91b7be7b3590bb1cbe8148873556aa3f
parent0d309cbddb49d4d948b3e9fe8423e80b3b64486b
Merge branch 'for-linus' of git://git./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