Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

author David Woodhouse <[email protected]>

Sat, 27 Aug 2005 12:30:07 +0000 (14:30 +0200)

committer David Woodhouse <[email protected]>

Sat, 27 Aug 2005 12:30:07 +0000 (14:30 +0200)
author David Woodhouse <[email protected]>
Sat, 27 Aug 2005 12:30:07 +0000 (14:30 +0200)
committer David Woodhouse <[email protected]>
Sat, 27 Aug 2005 12:30:07 +0000 (14:30 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/namei.c
Simple merge
author	David Woodhouse <[email protected]>
	Sat, 27 Aug 2005 12:30:07 +0000 (14:30 +0200)
committer	David Woodhouse <[email protected]>
	Sat, 27 Aug 2005 12:30:07 +0000 (14:30 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/namei.c	patch \|	diff1 \|	diff2 \|	blob \| history