]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'security/next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:36:43 +0000 (11:36 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:36:43 +0000 (11:36 +0200)
1  2 
MAINTAINERS
drivers/char/tpm/xen-tpmfront.c
init/Kconfig
security/selinux/hooks.c

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
Simple merge