]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 24 Mar 2016 12:52:09 +0000 (13:52 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 24 Mar 2016 12:52:09 +0000 (13:52 +0100)
Pull intel_idle patches for 4.6 from Len Brown.

* 'cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  intel_idle: Support for Intel Xeon Phi Processor x200 Product Family
  intel_idle: prevent SKL-H boot failure when C8+C9+C10 enabled


Trivial merge