Merge remote-tracking branch 'security/next'

author Thierry Reding <treding@nvidia.com>

Thu, 24 Oct 2013 12:36:59 +0000 (14:36 +0200)

committer Thierry Reding <treding@nvidia.com>

Thu, 24 Oct 2013 12:36:59 +0000 (14:36 +0200)
author Thierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:36:59 +0000 (14:36 +0200)
committer Thierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:36:59 +0000 (14:36 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/char/tpm/xen-tpmfront.c
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
author	Thierry Reding <treding@nvidia.com>
	Thu, 24 Oct 2013 12:36:59 +0000 (14:36 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Thu, 24 Oct 2013 12:36:59 +0000 (14:36 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/tpm/xen-tpmfront.c	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history