Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Wed, 5 Nov 2008 23:12:34 +0000 (07:12 +0800)
committerJames Morris <jmorris@namei.org>
Wed, 5 Nov 2008 23:12:34 +0000 (07:12 +0800)
commite21e696edb498c7f7eed42ba3096f6bbe13927b6
tree73b0bc28e45b0268f05c4b384a17bfb2140a73bc
parent2f99db28af90957271a6448479c3e492ccf7c697
parent75fa67706cce5272bcfc51ed646f2da21f3bdb6e
Merge branch 'master' into next
security/selinux/hooks.c