Merge branch 'sh/stable-updates'

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

Mon, 9 Nov 2009 01:55:36 +0000 (10:55 +0900)

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

Mon, 9 Nov 2009 01:55:36 +0000 (10:55 +0900)
author Paul Mundt <lethal@linux-sh.org>
Mon, 9 Nov 2009 01:55:36 +0000 (10:55 +0900)
committer Paul Mundt <lethal@linux-sh.org>
Mon, 9 Nov 2009 01:55:36 +0000 (10:55 +0900)
diff --cc arch/sh/kernel/dwarf.c
Simple merge
diff --cc arch/sh/mm/cache-sh4.c
Simple merge
author	Paul Mundt <lethal@linux-sh.org>
	Mon, 9 Nov 2009 01:55:36 +0000 (10:55 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Mon, 9 Nov 2009 01:55:36 +0000 (10:55 +0900)
		1	2
arch/sh/kernel/dwarf.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sh/mm/cache-sh4.c	patch \|	diff1 \|	diff2 \|	blob \| history