]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit17532abd7b1dbcdff67cd8e7ddeebf743cb2798f
tree2b6543b97264c11f0e948b568ec397c50d54eb76
parentf15c78f8811d5556e2cffc4dd6616d484c933c6c
parent62b53eb1294ac120bd34605dd665ee514ffec3ea
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