]> 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, 16 Oct 2012 23:48:33 +0000 (10:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 23:48:33 +0000 (10:48 +1100)
commit234b6fa0ebee78022ab0bdbb4dae5d3ebaba8961
tree0f3fc3425e2cb07e189a2ef284a8947703066cb3
parent94db707fd61ffb80c3748d5c1e731e09890f5243
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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