]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'idle/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Nov 2013 00:26:37 +0000 (11:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Nov 2013 00:26:37 +0000 (11:26 +1100)
commit015777a9ea3c524a0f98fb588fbfb8bdb775933e
tree646a427b5bed6e0a396549234e7982470bf403b6
parent07bf925b831a9786975b4333dc02a7db2fdcb7e6
parent8de8187d167c83f3dd7783db84955105f88558d0
Merge remote-tracking branch 'idle/next'

Conflicts:
drivers/idle/intel_idle.c