diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-11 20:11:20 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-11 20:11:20 -0500 |
| commit | 5177a94aea6fbffc897aaee29c7cde57f951b541 (patch) | |
| tree | a76509fda7b2e170c8e930d77bbb38dc40ee4e94 | |
| parent | 872912352c5be930e9568e5f3b6d73107d9f278d (diff) | |
| parent | bea57077e44ec9c1e6d3a3c142c8a3c0289e290d (diff) | |
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
| -rw-r--r-- | drivers/idle/intel_idle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 9cceacb92f9d..1bc0c170f12a 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c | |||
| @@ -727,6 +727,7 @@ static const struct x86_cpu_id intel_idle_ids[] = { | |||
| 727 | ICPU(0x46, idle_cpu_hsw), | 727 | ICPU(0x46, idle_cpu_hsw), |
| 728 | ICPU(0x4d, idle_cpu_avn), | 728 | ICPU(0x4d, idle_cpu_avn), |
| 729 | ICPU(0x3d, idle_cpu_bdw), | 729 | ICPU(0x3d, idle_cpu_bdw), |
| 730 | ICPU(0x47, idle_cpu_bdw), | ||
| 730 | ICPU(0x4f, idle_cpu_bdw), | 731 | ICPU(0x4f, idle_cpu_bdw), |
| 731 | ICPU(0x56, idle_cpu_bdw), | 732 | ICPU(0x56, idle_cpu_bdw), |
| 732 | {} | 733 | {} |