diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-21 16:26:49 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-21 16:26:49 +0100 |
| commit | a74a5a3381c0f600d390e3997976c4ddf31417ab (patch) | |
| tree | 74f6a5d328f8d0f5026db63d5760c355bf938cc5 /mm/slab_common.c | |
| parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
| parent | 18f95a3640dbf421ab9532e517070a0c1cd4d582 (diff) | |
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
Diffstat (limited to 'mm/slab_common.c')
0 files changed, 0 insertions, 0 deletions