| commit | 9f06cf38eca57e279b4c78e465e19f10c2f78174 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Thu Jan 12 12:57:32 2012 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Thu Jan 12 12:57:32 2012 +0900 |
| tree | c33b3b3e5dc32a1211bd8c99a4eed3752c05108b | |
| parent | a4d5247310c993b6b30f1686be12ddacfc41142a [diff] | |
| parent | d3442b2bb7ce4089fadcf483b8ae9766ab480238 [diff] |
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>