Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into...
authorJames Morris <jmorris@namei.org>
Fri, 10 Oct 2008 22:26:14 +0000 (09:26 +1100)
committerJames Morris <jmorris@namei.org>
Fri, 10 Oct 2008 22:26:14 +0000 (09:26 +1100)
commit0da939b0058742ad2d8580b7db6b966d0fc72252
tree47cb109fdf97135191bff5db4e3bfc905136bf8b
parent4bdec11f560b8f405a011288a50e65b1a81b3654
parentd91d40799165b0c84c97e7c71fb8039494ff07dc
Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next
security/selinux/hooks.c
security/selinux/ss/services.c
security/smack/smackfs.c