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)
commit845252ec075eea1aa320aeeb714d1e92346ffd4e
tree6cf7196c253f812029e2bf7455fda33f9befd8d5
parent03dd1312b92fd8da59bab3a56a2b96d4447dd295
parentb4b4ff823decd7ce0b99d0d146cb87aca4602007
Merge branch 'release' of git://git.kernel.org/pub/scm/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