]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42e0576 817c876)
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 02:49:45 +0000 (12:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 02:49:45 +0000 (12:49 +1000)
Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c


Trivial merge
Linux kernel for KaRo TX COM modules