]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 04:33:28 +0000 (14:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 04:33:28 +0000 (14:33 +1000)
commit9f5fd7a96c5d3cb116f2b64ea754eb42023e89c4
treeb5107b6f6ce285182adb81535efc95e2714005d5
parent3975fa6bbe47d72ea1cd947da5800cdaac1e6da8
parent4f9a60f5c7e74f3e413a1ede1e8b959d01df4e57
Merge remote-tracking branch 'security/next'

Conflicts:
drivers/char/tpm/tpm-chip.c
MAINTAINERS
drivers/char/tpm/tpm_infineon.c
security/smack/smack_lsm.c