Merge tag 'v3.12'
authorPaul Moore <pmoore@redhat.com>
Tue, 26 Nov 2013 22:32:55 +0000 (17:32 -0500)
committerPaul Moore <pmoore@redhat.com>
Tue, 26 Nov 2013 22:32:55 +0000 (17:32 -0500)
commitdd0a11815a339d6deeea8357574f8126a8404c92
treec3c743ac6323e1caf9e987d6946cc4b2333a8256
parent42d64e1add3a1ce8a787116036163b8724362145
parent5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52
Merge tag 'v3.12'

Linux 3.12
MAINTAINERS
include/linux/security.h
security/capability.c
security/security.c
security/selinux/hooks.c
security/selinux/include/xfrm.h