Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into...
James Morris [Fri, 10 Oct 2008 22:26:14 +0000 (09:26 +1100)]
1  2 
security/selinux/hooks.c
security/selinux/ss/services.c
security/smack/smackfs.c

Simple merge
Simple merge
Simple merge