diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 03:57:32 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 03:57:32 (GMT) |
commit | 9f06cf38eca57e279b4c78e465e19f10c2f78174 (patch) | |
tree | c33b3b3e5dc32a1211bd8c99a4eed3752c05108b /arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |
parent | a4d5247310c993b6b30f1686be12ddacfc41142a (diff) | |
parent | d3442b2bb7ce4089fadcf483b8ae9766ab480238 (diff) | |
download | linux-9f06cf38eca57e279b4c78e465e19f10c2f78174.tar.xz |
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>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7722.c')
0 files changed, 0 insertions, 0 deletions