]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'acpi-battery' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Jan 2014 21:49:08 +0000 (22:49 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Jan 2014 21:49:08 +0000 (22:49 +0100)
commit4ebf61f0462ed415c7cfabccb0528fd515a5e767
tree8d9f56eb0e4c60105e9fe0ca8c27fd050a8760d9
parent70cc536c801f5680e52d5b3ecc8147adb7a59b88
parentc473d9df2f0fd211b31209d2ff53f89dff441fa4
parent7351664140953ebc3870783227d63f927df3d8a4
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.