]> 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, 12 Sep 2012 01:44:26 +0000 (11:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 01:44:26 +0000 (11:44 +1000)
commitc6021a1d82ebf92a0a6d1f1e03fe64e599d7bb99
treea3e35b814aa77eff7e890389cbe07f7e30c46001
parentc656ad1db8c840925105f339eb7e02013a6dc166
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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