]> 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, 25 Jul 2012 00:24:06 +0000 (10:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:24:06 +0000 (10:24 +1000)
commit74150afb22412afbee5503659c50c7fe2a64dacf
treec0cf3c438931163b7ad03cd8ff100fff5a63137c
parentf440264d195d55b5a3c77adae8d61ef6dbf3bb78
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c