Merge branches 'turbostat' and 'intel_idle' into release
authorLen Brown <len.brown@intel.com>
Fri, 4 Apr 2014 17:05:22 +0000 (13:05 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 4 Apr 2014 17:05:22 +0000 (13:05 -0400)

Trivial merge