]> 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)
commit9630dd3440c059fc8112ce8bd1395c544eed6829
tree8d9f56eb0e4c60105e9fe0ca8c27fd050a8760d9
parent5bb42e0d7d60c7c4f8ad1982847a6acc67b337fb
parent9bf520d4748e113ad37dc5ed238004ea881d84fc
parent544ef062321803846ee31cfd99f97ab7cb06416b
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.