Merge with /shiny/git/linux-2.6/.git
David Woodhouse [Tue, 9 Aug 2005 15:51:35 +0000 (16:51 +0100)]
1  2 
MAINTAINERS
fs/namei.c
security/selinux/hooks.c
security/selinux/ss/services.c

diff --cc MAINTAINERS
Simple merge
diff --cc fs/namei.c
Simple merge
Simple merge
Simple merge