]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branches 'acpi-ec' and 'acpi-processor'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 May 2014 22:20:31 +0000 (00:20 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 May 2014 22:20:31 +0000 (00:20 +0200)
* acpi-ec:
  ACPI / EC: Process rather than discard events in acpi_ec_clear

* acpi-processor:
  ACPI / processor: Fix failure of loading acpi-cpufreq driver


Trivial merge