]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitba473e53740021cb99892a5f20163060b4e90db3
treec33b3b3e5dc32a1211bd8c99a4eed3752c05108b
parent4f4b36bb7a909d1a11e05067ee001c2ba2fd67dd
parent9e418951083370cca63891af9b31da3ca14adbc4
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