From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 6 Jan 2014 21:49:08 +0000 (+0100)
Subject: Merge branches 'acpi-battery' and 'pm-cpufreq'
X-Git-Tag: firefly_0821_release~176^2~4688^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=77410baf453e271680e919145b8b377a42a54e91;p=firefly-linux-kernel-4.4.55.git

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.
---

77410baf453e271680e919145b8b377a42a54e91