]> 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, 22 Aug 2012 02:00:20 +0000 (12:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 02:00:20 +0000 (12:00 +1000)
commit185935eba446d23bc7b9171560ba8c928d8e6cee
treea7930d23c8aa553cd0b818f05bdb95ace46f5005
parent331ce6951c9b8237f3e6385d7dd938f425a0dc48
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c