]> 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, 10 Oct 2012 23:13:40 +0000 (10:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 23:13:40 +0000 (10:13 +1100)
commit7dc15f120ab7be04233b26e5be582fc0657df553
tree3616ada35e7afbfdcc69a4a1c6035d055077a2cb
parentc217ead47e778c08c0254986b5eb1cfd3cb628ef
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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