]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 01:09:51 +0000 (11:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 01:09:51 +0000 (11:09 +1000)
commit176efe8a50a3650da805df36917046f9f06fd2be
tree4cd0684fa44644e69ec872e0de80bdbd85444aeb
parent119a4903a1d5784d6b57fb832de1709354801949
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c