]> 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)
commitfd619935740735057e025ff662b7d962cef2a10c
treec33b3b3e5dc32a1211bd8c99a4eed3752c05108b
parent0ecca82f9978daa2fde9ddbddcb617e8a62758c9
parent0923649c4e82ed8eb408d58cbfd97749c7357afa
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