]> 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)
commit9f68585f775940f2058b5cc5f1610ecf3c8864ef
tree2b6543b97264c11f0e948b568ec397c50d54eb76
parenta0c8457f4a97719ea3afd4b808706f250a744b18
parent4a5b0bcdcaddf2ffe6ad8051aa73e9b7bd9c6d24
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