]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into...
authorJames Morris <james.l.morris@oracle.com>
Thu, 13 Nov 2014 10:49:53 +0000 (21:49 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 13 Nov 2014 10:49:53 +0000 (21:49 +1100)
1  2 
security/selinux/hooks.c

Simple merge