]> www.infradead.org Git - users/griffoul/linux.git/commitdiff
projects / users / griffoul / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32c2e67 615e51f)
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Sat, 19 Jul 2014 07:39:19 +0000 (17:39 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sat, 19 Jul 2014 07:39:19 +0000 (17:39 +1000)
1  2 
security/selinux/hooks.c patch | diff1 | diff2 | blob | history

diff --cc security/selinux/hooks.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.