Merge branch 'cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into pm-cpuidle

Pull intel_idle update for v3.20 from Len Brown.

* 'cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  intel_idle: support additional Broadwell model
This commit is contained in:
Rafael J. Wysocki 2015-02-12 02:11:20 +01:00
commit 5177a94aea

View File

@ -727,6 +727,7 @@ static const struct x86_cpu_id intel_idle_ids[] = {
ICPU(0x46, idle_cpu_hsw), ICPU(0x46, idle_cpu_hsw),
ICPU(0x4d, idle_cpu_avn), ICPU(0x4d, idle_cpu_avn),
ICPU(0x3d, idle_cpu_bdw), ICPU(0x3d, idle_cpu_bdw),
ICPU(0x47, idle_cpu_bdw),
ICPU(0x4f, idle_cpu_bdw), ICPU(0x4f, idle_cpu_bdw),
ICPU(0x56, idle_cpu_bdw), ICPU(0x56, idle_cpu_bdw),
{} {}