]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 01:13:29 +0000 (11:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 01:13:29 +0000 (11:13 +1000)
commitd8e42ad82bdae28998ab72be14712ab7da933d03
tree790ba077163acc81c12dd89ff5ff123fd68f7ad7
parentea6e98ae181f94d77118429b0cfcb05ac18b02bd
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c