]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next
authorLen Brown <len.brown@intel.com>
Mon, 7 Nov 2011 03:14:50 +0000 (22:14 -0500)
committerLen Brown <len.brown@intel.com>
Mon, 7 Nov 2011 03:14:50 +0000 (22:14 -0500)
1  2  3  4 
tools/power/x86/turbostat/turbostat.c

Simple merge