diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:32 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:32 +0900 |
| commit | 9f06cf38eca57e279b4c78e465e19f10c2f78174 (patch) | |
| tree | c33b3b3e5dc32a1211bd8c99a4eed3752c05108b /arch/arm/mach-pxa/pxa320.c | |
| parent | sh: add a resource name for shdma (diff) | |
| parent | sh: also without PM_RUNTIME pm_runtime.o must be built (diff) | |
| download | linux-dev-9f06cf38eca57e279b4c78e465e19f10c2f78174.tar.xz linux-dev-9f06cf38eca57e279b4c78e465e19f10c2f78174.zip | |
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/arm/mach-pxa/pxa320.c')
0 files changed, 0 insertions, 0 deletions