diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-18 13:23:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-18 13:23:44 -0700 |
commit | b6a89584c36f307f2c2bbb136ea50985ca4bc7b4 (patch) | |
tree | 3913dbb9ebe07927e16ed0518fc1a1af00787dc6 /arch/s390/include/asm/fb.h | |
parent | 0db7bd8ca0033c1530bcefcbd49002364dba908a (diff) | |
parent | d52fc5dde171f030170a6cb78034d166b13c9445 (diff) |
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:
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
Diffstat (limited to 'arch/s390/include/asm/fb.h')
0 files changed, 0 insertions, 0 deletions