projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60b8b1d ded5098)
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...
authorJames Morris <jmorris@namei.org>
Tue, 14 Jun 2011 23:41:48 +0000 (09:41 +1000)
committerJames Morris <jmorris@namei.org>
Tue, 14 Jun 2011 23:41:48 +0000 (09:41 +1000)
1  2 
security/selinux/selinuxfs.c patch | diff1 | diff2 | blob | history

diff --cc security/selinux/selinuxfs.c
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git