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)
commit73df623addeaa6154b325b429a6c06eb6ad36004
tree6cf7196c253f812029e2bf7455fda33f9befd8d5
parent9bc0482feae8763447746c89fd971704c819b52e
parent23a299cd93781a190cdca0d7d16034837b7dfd86
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux into pm-cpuidle

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