]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'acpi-idle', 'arm-idle' and 'intel-idle' into idle-remove-statedata
authorLen Brown <len.brown@intel.com>
Fri, 8 Feb 2013 23:56:43 +0000 (18:56 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 8 Feb 2013 23:56:43 +0000 (18:56 -0500)

Trivial merge