Merge with /shiny/git/linux-2.6/.git

author David Woodhouse <[email protected]>

Wed, 13 Jul 2005 14:25:59 +0000 (15:25 +0100)

committer David Woodhouse <[email protected]>

Wed, 13 Jul 2005 14:25:59 +0000 (15:25 +0100)
author David Woodhouse <[email protected]>
Wed, 13 Jul 2005 14:25:59 +0000 (15:25 +0100)
committer David Woodhouse <[email protected]>
Wed, 13 Jul 2005 14:25:59 +0000 (15:25 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc include/linux/audit.h
Simple merge
author	David Woodhouse <[email protected]>
	Wed, 13 Jul 2005 14:25:59 +0000 (15:25 +0100)
committer	David Woodhouse <[email protected]>
	Wed, 13 Jul 2005 14:25:59 +0000 (15:25 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/namei.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/audit.h	patch \|	diff1 \|	diff2 \|	blob \| history