tree c33b3b3e5dc32a1211bd8c99a4eed3752c05108b
parent a4d5247310c993b6b30f1686be12ddacfc41142a
parent d3442b2bb7ce4089fadcf483b8ae9766ab480238
author Paul Mundt <lethal@linux-sh.org> 1326340652 +0900
committer Paul Mundt <lethal@linux-sh.org> 1326340652 +0900

Merge branch 'sh/pm-runtime' into sh-latest

Conflicts:
	arch/sh/kernel/cpu/sh4a/clock-sh7723.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>