]> 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, 12 Nov 2012 00:17:00 +0000 (11:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 00:17:00 +0000 (11:17 +1100)
commitb446cfab483149d69a169a55b47ae362cb41d103
tree1a6cc949c775623604d300661126784f039ef013
parent2a0e6f5d9872bf3fb69092e417dea50e188f1031
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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