Merge branch 'master' into next
James Morris [Mon, 22 Sep 2008 00:41:56 +0000 (17:41 -0700)]
Conflicts:

MAINTAINERS

Thanks for breaking my tree :-)

Signed-off-by: James Morris <jmorris@namei.org>

1  2 
MAINTAINERS
security/selinux/ss/services.c

diff --cc MAINTAINERS
Simple merge
Simple merge