]> 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, 26 Sep 2012 01:26:01 +0000 (11:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 01:26:01 +0000 (11:26 +1000)
commitbe0765b009d906e94bb33412dbb028f4d07a8ec2
treec3304a44ecc639f181e5c41b98ffb7cff845825c
parent891cadad6e5bab83bf69df7265c9ae4c6f4d87b6
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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