tree 39d894f4e06b068144b7f26f2c01eca5df72850e
parent 802eee95bde72fd0cd0f3a5b2098375a487d1eda
parent 5781532ebecd9e0b7b5fc25d78030bdec635f4ac
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1388524088 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1388524088 +0100

Merge branch 'cpuidle/3.13-fixes' of git://git.linaro.org/people/daniel.lezcano/linux into pm-cpuidle

Pull ARM cpuidle fixes for v3.13 from Daniel Lezcano.

* 'cpuidle/3.13-fixes' of git://git.linaro.org/people/daniel.lezcano/linux:
  ARM/cpuidle: remove __init tag from Calxeda cpuidle probe function