Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next

author Len Brown <len.brown@intel.com>

Mon, 7 Nov 2011 03:14:50 +0000 (22:14 -0500)

committer Len Brown <len.brown@intel.com>

Mon, 7 Nov 2011 03:14:50 +0000 (22:14 -0500)
author Len Brown <len.brown@intel.com>
Mon, 7 Nov 2011 03:14:50 +0000 (22:14 -0500)
committer Len Brown <len.brown@intel.com>
Mon, 7 Nov 2011 03:14:50 +0000 (22:14 -0500)
diff --cc tools/power/x86/turbostat/turbostat.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Mon, 7 Nov 2011 03:14:50 +0000 (22:14 -0500)
committer	Len Brown <len.brown@intel.com>
	Mon, 7 Nov 2011 03:14:50 +0000 (22:14 -0500)