| commit | 0a924200ae5fcf7b3d237d92a110545b6db6aa18 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Fri Nov 21 16:31:42 2014 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Fri Nov 21 16:31:42 2014 +0100 |
| tree | 2b6543b97264c11f0e948b568ec397c50d54eb76 | |
| parent | a74a5a3381c0f600d390e3997976c4ddf31417ab [diff] | |
| parent | b82b6cca488074da3852e8a54fde1d9f74bf1557 [diff] |
Merge back earlier cpuidle material for 3.19-rc1. Conflicts: drivers/cpuidle/dt_idle_states.c