tree 56c0e18d498dee86ec9ff018d6070c8d08443be1
parent 896f0c0e8e4ee02ee72a203aef79f362d5f7b7cc
parent f875295c4bfb39e96d136edd8ac80567e73536b4
author Paul Mundt <lethal@linux-sh.org> 1255684562 +0900
committer Paul Mundt <lethal@linux-sh.org> 1255684562 +0900

Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/Kconfig