]> 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, 30 Oct 2012 01:02:23 +0000 (12:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 01:02:23 +0000 (12:02 +1100)
commit83f8ba9ee29a4020980d84d8df78fff1759f5065
tree3992dbdced0d37d12b2fc93f05e98dc36950b007
parent2fe52e20c87d5b2fb132fc0aad7bd90e08d0c7c0
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h