]> 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, 23 Oct 2012 00:32:33 +0000 (11:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Oct 2012 00:32:33 +0000 (11:32 +1100)
commita32c051a5f621ea4f7062f88b70b36aaeabf4c88
treecfa2deaea4c2a2f1153c279d2c21ead915fc5ad1
parent1ae9848062d50bafe93ce6ba9e6241d3873ac9f5
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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