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)
commitaeda4ac3efc29e4d55989abd0a73530453aa69ba
tree35b3d2cca8bfb49cf08bf1c6b55b586c1e5971e7
parentd2e7ad19229f982fc1eb731827d82ceac90abfb3
parent350e4f31e0eaf56dfc3b328d24a11bdf42a41fb8
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
security/selinux/hooks.c
security/selinux/selinuxfs.c