summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-06 22:49:08 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-06 22:49:08 +0100
commit77410baf453e271680e919145b8b377a42a54e91 (patch)
tree8d9f56eb0e4c60105e9fe0ca8c27fd050a8760d9 /mm
parentc8d150761ca6d1266cbcdc1a64529759b5b6068e (diff)
parenta90b40385735af0d3031f98e97b439e8944a31b3 (diff)
parent6cbd7ee10e2842a3d1f9b60abede1c8f3d1f1130 (diff)
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.