Merge branch 'sh/pm-runtime' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Thu, 12 Jan 2012 03:57:32 +0000 (12:57 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 12 Jan 2012 03:57:32 +0000 (12:57 +0900)
commit9f06cf38eca57e279b4c78e465e19f10c2f78174
treec33b3b3e5dc32a1211bd8c99a4eed3752c05108b
parenta4d5247310c993b6b30f1686be12ddacfc41142a
parentd3442b2bb7ce4089fadcf483b8ae9766ab480238
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>
arch/sh/kernel/cpu/sh4a/clock-sh7723.c
arch/sh/kernel/cpu/sh4a/clock-sh7724.c