]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 04:01:48 +0000 (14:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 04:01:48 +0000 (14:01 +1000)
commit396ffbba8a0d7b7cd7a4034145d24b402d7e97d7
tree78138afffbac15cb12989a03b35911a4349ab6ae
parentd22066a0ea299c7dc84cbb4c26bb074072c435ad
parent817c876374a090391e7f2873a8b6076537f42253
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c