Merge with /shiny/git/linux-2.6/.git
David Woodhouse [Wed, 13 Jul 2005 14:25:59 +0000 (15:25 +0100)]
1  2 
MAINTAINERS
fs/namei.c
include/linux/audit.h

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