From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 8 Apr 2014 11:25:25 +0000 (+0200)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Tag: v3.15-rc1~28^2~4^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=73df623addeaa6154b325b429a6c06eb6ad36004;p=karo-tx-linux.git

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
---

73df623addeaa6154b325b429a6c06eb6ad36004