]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 01:49:34 +0000 (11:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 01:49:34 +0000 (11:49 +1000)
commit9c7706012d58e7ace45598e275798847f3da65d0
treecdf0faa2f59661ad7c7b02c3f8b3e3c9caa69378
parentf7a7fce512bd1cb267d1fa6647fa1ff11cd63b1b
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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