Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...
James Morris [Tue, 14 Jun 2011 23:41:48 +0000 (09:41 +1000)]
1  2 
security/selinux/selinuxfs.c

Simple merge