Merge back earlier cpuidle material for 3.19-rc1.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Nov 2014 15:31:42 +0000 (16:31 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Nov 2014 15:31:42 +0000 (16:31 +0100)
commit0a924200ae5fcf7b3d237d92a110545b6db6aa18
tree2b6543b97264c11f0e948b568ec397c50d54eb76
parenta74a5a3381c0f600d390e3997976c4ddf31417ab
parentb82b6cca488074da3852e8a54fde1d9f74bf1557
Merge back earlier cpuidle material for 3.19-rc1.

Conflicts:
drivers/cpuidle/dt_idle_states.c
drivers/cpuidle/cpuidle-arm64.c
drivers/cpuidle/dt_idle_states.c