]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Wed, 19 Aug 2009 23:18:42 +0000 (09:18 +1000)
committerJames Morris <jmorris@namei.org>
Wed, 19 Aug 2009 23:18:42 +0000 (09:18 +1000)
commitf0907484b63b0faac663fc28ddd2f4b62a00d9a1
tree1fe96ab392c1ff203a6fb3f67ed0ed577056572e
parente9403868b08cbf577524eb72aefadfca981f76c3
parent67f56d3c0c486c121842d30e819c3152c3aa65f5
Merge branch 'master' into next

Conflicts:
security/Kconfig

Manual fix.

Signed-off-by: James Morris <jmorris@namei.org>
include/linux/sched.h
security/selinux/hooks.c