summaryrefslogtreecommitdiffstats
path: root/drivers/cpuidle
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-12 17:39:15 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-12 17:39:15 +0100
commit1b3862798cf4390b9110e54e405646e156f47c83 (patch)
treec7df5be81623cfd63459758a7a87ed3b5a9d44b3 /drivers/cpuidle
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest (diff)
parentMerge branches 'turbostat' and 'x86_energy_perf_policy' into tools (diff)
downloadlinux-1b3862798cf4390b9110e54e405646e156f47c83.tar.xz
linux-1b3862798cf4390b9110e54e405646e156f47c83.zip
Merge branch 'tools' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'tools' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6: tools: create power/x86/x86_energy_perf_policy tools: create power/x86/turbostat
Diffstat (limited to 'drivers/cpuidle')
0 files changed, 0 insertions, 0 deletions