Merge branches 'sh/urgent' and 'sh/regulator' into sh-latest

author Paul Mundt <[email protected]>

Wed, 25 Jul 2012 04:13:09 +0000 (13:13 +0900)

committer Paul Mundt <[email protected]>

Wed, 25 Jul 2012 04:13:09 +0000 (13:13 +0900)
author Paul Mundt <[email protected]>
Wed, 25 Jul 2012 04:13:09 +0000 (13:13 +0900)
committer Paul Mundt <[email protected]>
Wed, 25 Jul 2012 04:13:09 +0000 (13:13 +0900)
diff --cc arch/sh/boards/Kconfig
Simple merge
diff --cc arch/sh/boards/board-polaris.c
Simple merge
diff --cc arch/sh/boards/mach-kfr2r09/setup.c
Simple merge
author	Paul Mundt <[email protected]>
	Wed, 25 Jul 2012 04:13:09 +0000 (13:13 +0900)
committer	Paul Mundt <[email protected]>
	Wed, 25 Jul 2012 04:13:09 +0000 (13:13 +0900)
		1	2
arch/sh/boards/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sh/boards/board-polaris.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sh/boards/mach-kfr2r09/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history