]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 01:03:40 +0000 (12:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 01:03:40 +0000 (12:03 +1100)
commitf243b868174e60f489a861c187e172b391618367
treedac8cb04bd2d93aa4285ef4a92d464b803b8b55c
parent919c2d6acaa5719817fdfed589036e44413891af
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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