]> 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, 19 Sep 2012 01:08:55 +0000 (11:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 01:08:55 +0000 (11:08 +1000)
commita0fa71d8b0dae3db9e35a0cdf2d43915ba14e991
treed8827e738f0a6eac34003e2a7969437e02fe2015
parent3c89461fc9c6b6c23daa334fd1b4666958f1e006
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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