]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 00:46:21 +0000 (11:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 00:46:21 +0000 (11:46 +1100)
commit9f477e96c2d1f9427cf190558ce22733fb9b4e64
tree68bdab207c1a05dc27df35e91cb645006ffb5052
parent14bf2378b6ebf6c6ec295ed8ce7a319c44d8dc61
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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