Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Thu, 18 Jun 2009 22:20:55 +0000 (08:20 +1000)
committerJames Morris <jmorris@namei.org>
Thu, 18 Jun 2009 22:20:55 +0000 (08:20 +1000)
commitd905163c5b23f6d8511971e06081a1b525e8a0bd
treef76918c1be802ec068d37763466f5518efdb690e
parent44c2d9bdd7022ca7d240d5adc009296fc1c6ce08
parent0732f87761dbe417cb6e084b712d07e879e876ef
Merge branch 'master' into next
security/selinux/avc.c
security/selinux/ss/services.c