]> 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 00:06:51 +0000 (11:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 00:06:51 +0000 (11:06 +1100)
commit8e8402f1d2a310ad46808fa1081375267efc43ea
tree88413e90c1b5238c35b3601a3876ba4e6baf8bb7
parentd5733d00691f00400fe76254fea7fc324dc18e2e
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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