]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Apr 2013 01:13:53 +0000 (12:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Apr 2013 01:13:53 +0000 (12:13 +1100)
commita4edb3642b0c3f8374012fd03620cf0dc48c54cc
tree5a635bdddfdc5d189624962a1eabac8a8f52f8e1
parentb5745be41d947a6a66831181dae6c81ca6f4c3ba
parent817c876374a090391e7f2873a8b6076537f42253
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/base/power/qos.c