Merge branches 'idle-fix' and 'misc' into release
commiteeaab2d8af2cf1d36d7086f22e9de42d6dd2995c
authorLen Brown <len.brown@intel.com>
Sat, 7 Apr 2012 01:48:59 +0000 (6 21:48 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 7 Apr 2012 01:48:59 +0000 (6 21:48 -0400)
tree369b9c91a6d808944f07d2290fec6f9fe2731904
parentee01e663373343c63e0e3d364d09f6155378dbcc
parentaaef292acf3a78d9c0bb6fb72226077d286b45d7
Merge branches 'idle-fix' and 'misc' into release
drivers/acpi/processor_idle.c
drivers/cpuidle/cpuidle.c