Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into...

diff --cc security/selinux/hooks.c
Simple merge

diff --cc security/selinux/ss/services.c
Simple merge

diff --cc security/smack/smackfs.c
Simple merge