projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2e7ad1 350e4f3)
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
authorJames Morris <jmorris@namei.org>
Sun, 9 Jan 2011 23:40:42 +0000 (10:40 +1100)
committerJames Morris <jmorris@namei.org>
Sun, 9 Jan 2011 23:40:42 +0000 (10:40 +1100)
1  2 
security/selinux/hooks.c patch | diff1 | diff2 | blob | history
security/selinux/selinuxfs.c patch | diff1 | diff2 | blob | history

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