Skip to content
Commit a74a5a33 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'cpuidle/3.19' of...

Merge branch 'cpuidle/3.19' of http://git.linaro.org/git-ro/people/daniel.lezcano/linux into pm-cpuidle

Pull ARM cpuidle material for 3.19-rc1 from Daniel Lezcano.

* 'cpuidle/3.19' of http://git.linaro.org/git-ro/people/daniel.lezcano/linux:
  drivers: cpuidle: Remove cpuidle-arm64 duplicate error messages
  drivers: cpuidle: Add idle-state-name description to ARM idle states
  drivers: cpuidle: Add status property to ARM idle states
parents fc14f9c1 18f95a36
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment