Merge branch 'sh/stable-updates'

author Paul Mundt <lethal@linux-sh.org>

Tue, 27 Oct 2009 08:10:24 +0000 (17:10 +0900)

committer Paul Mundt <lethal@linux-sh.org>

Tue, 27 Oct 2009 08:10:24 +0000 (17:10 +0900)
author Paul Mundt <lethal@linux-sh.org>
Tue, 27 Oct 2009 08:10:24 +0000 (17:10 +0900)
committer Paul Mundt <lethal@linux-sh.org>
Tue, 27 Oct 2009 08:10:24 +0000 (17:10 +0900)
diff --cc arch/sh/Kconfig
Simple merge
diff --cc arch/sh/mm/Kconfig
Simple merge
author	Paul Mundt <lethal@linux-sh.org>
	Tue, 27 Oct 2009 08:10:24 +0000 (17:10 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Tue, 27 Oct 2009 08:10:24 +0000 (17:10 +0900)
		1	2
arch/sh/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sh/mm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history