]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'idle/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 01:53:21 +0000 (11:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 01:53:21 +0000 (11:53 +1000)
1  2 
drivers/idle/intel_idle.c
include/linux/cpuidle.h

Simple merge
Simple merge