]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit9cf94180e82b2a54f42560d2fa38c2e9f1c0b57f
treeb7ddd6086af606e532a680addc8ea3cc32d62c84
parent8bd12467a745fd42698da2c16d95f91186d513ea
parent817c876374a090391e7f2873a8b6076537f42253
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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