diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-06 22:49:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-06 22:49:08 +0100 |
| commit | 77410baf453e271680e919145b8b377a42a54e91 (patch) | |
| tree | 8d9f56eb0e4c60105e9fe0ca8c27fd050a8760d9 | |
| parent | Merge branches 'acpi-ac' and 'acpi-tpm' (diff) | |
| parent | ACPI / Battery: Add a _BIX quirk for NEC LZ750/LS (diff) | |
| parent | intel_pstate: Add X86_FEATURE_APERFMPERF to cpu match parameters. (diff) | |
| download | linux-dev-77410baf453e271680e919145b8b377a42a54e91.tar.xz linux-dev-77410baf453e271680e919145b8b377a42a54e91.zip | |
Merge branches 'acpi-battery' and 'pm-cpufreq'
* acpi-battery:
ACPI / Battery: Add a _BIX quirk for NEC LZ750/LS
* pm-cpufreq:
intel_pstate: Add X86_FEATURE_APERFMPERF to cpu match parameters.