| commit | f1618a7a27df4f7870c1d5f25f0aba62b52069a2 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Wed Aug 14 22:18:43 2013 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Wed Aug 14 22:18:43 2013 +0200 |
| tree | 1f3c1b2d1005814a9e862ba2f8596f665d780948 | |
| parent | ee42f75dba3c66e559a13ac86ad1889d2a396378 [diff] | |
| parent | 75d6137da195a1e059e1c814cb95635e168f85c0 [diff] |
Merge branch 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux into pm-cpuidle Pull ARM cpuidle updates from Daniel Lezcano. * 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux: cpuidle: kirkwood: Make kirkwood_cpuidle_remove function static cpuidle: calxeda: Add missing __iomem annotation SH: cpuidle: Add missing parameter for cpuidle_register()