]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:48:30 +0000 (10:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:48:30 +0000 (10:48 +1100)
commit8f055c6557229ae792faa50885a5adb14ad175c0
tree4cd0f89fe68ae417596b2104451bb97f6cf86918
parentbaf6cbc93ee2ba25ccce3df8d71702fb48299aac
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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