]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:24:44 +0000 (12:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:24:44 +0000 (12:24 +1000)
Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c


Trivial merge