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)
Conflicts:
drivers/cpuidle/dt_idle_states.c


Trivial merge