]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:56:12 +0000 (13:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:56:12 +0000 (13:56 +1100)
commite48a018aa7cbe7a78467a13b8580ecc2389ad64e
treeed25497f4b6032b22376a07cd0e47e09aa1667f7
parent8efa89220d0efd3cd8ea487c705a5256ac9ca4eb
parent923b49ff69fcbffe6f8b2739de218c45544392a7
Merge remote-tracking branch 'security/next'

Conflicts:
drivers/char/tpm/tpm_ppi.c
MAINTAINERS
security/selinux/hooks.c