]> 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, 29 Oct 2012 00:16:09 +0000 (11:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Oct 2012 00:16:09 +0000 (11:16 +1100)
commit8c7c3c6d002d21c669854fee8125da5944fc6982
tree4a21547c9fb69b7b7fd4f207f7746fc9246d4ff6
parent9a8197837d4c4aef97e4ea757e6c8aeb5bff93b8
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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