Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Apr 2012 20:23:44 +0000 (13:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Apr 2012 20:23:44 +0000 (13:23 -0700)
commitb6a89584c36f307f2c2bbb136ea50985ca4bc7b4
tree3913dbb9ebe07927e16ed0518fc1a1af00787dc6
parent0db7bd8ca0033c1530bcefcbd49002364dba908a
parentd52fc5dde171f030170a6cb78034d166b13c9445
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:
  fcaps: clear the same personality flags as suid when fcaps are used
  mpi: Avoid using freed pointer in mpi_lshift_limbs()
  Smack: move label list initialization