Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 8 Apr 2014 11:25:25 +0000 (13:25 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 8 Apr 2014 11:25:25 +0000 (13:25 +0200)
Pull intel_idle and turbostat material for v3.15-rc1 from Len Brown.

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  intel_idle: fine-tune IVT residency targets
  tools/power turbostat: Run on Broadwell
  tools/power turbostat: simplify output, add Avg_MHz
  intel_idle: Add CPU model 54 (Atom N2000 series)
  intel_idle: support Bay Trail
  intel_idle: allow sparse sub-state numbering, for Bay Trail
  ACPI idle: permit sparse C-state sub-state numbers


Trivial merge