Merge branch 'cpuidle' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 24 Aug 2015 21:09:17 +0000 (23:09 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 24 Aug 2015 21:09:17 +0000 (23:09 +0200)
Pull intel_idle changes for v4.3 from Len Brown.

* 'cpuidle' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  intel_idle: Skylake Client Support
  intel_idle: allow idle states to be freeze-mode specific


Trivial merge