From: Rafael J. Wysocki Date: Wed, 14 Aug 2013 20:18:43 +0000 (+0200) Subject: Merge branch 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux into... X-Git-Tag: firefly_0821_release~176^2~5323^2~3^2~13 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f1618a7a27df4f7870c1d5f25f0aba62b52069a2;p=firefly-linux-kernel-4.4.55.git 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() --- f1618a7a27df4f7870c1d5f25f0aba62b52069a2