Merge Linux 2.6.23

author David Woodhouse <dwmw2@infradead.org>

Sat, 13 Oct 2007 13:43:54 +0000 (14:43 +0100)

committer David Woodhouse <dwmw2@infradead.org>

Sat, 13 Oct 2007 13:43:54 +0000 (14:43 +0100)
author David Woodhouse <dwmw2@infradead.org>
Sat, 13 Oct 2007 13:43:54 +0000 (14:43 +0100)
committer David Woodhouse <dwmw2@infradead.org>
Sat, 13 Oct 2007 13:43:54 +0000 (14:43 +0100)
diff --cc fs/Kconfig
Simple merge
diff --cc fs/jffs2/fs.c
Simple merge
author	David Woodhouse <dwmw2@infradead.org>
	Sat, 13 Oct 2007 13:43:54 +0000 (14:43 +0100)
committer	David Woodhouse <dwmw2@infradead.org>
	Sat, 13 Oct 2007 13:43:54 +0000 (14:43 +0100)
		1	2
fs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
fs/jffs2/fs.c	patch \|	diff1 \|	diff2 \|	blob \| history