diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-03 00:20:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-03 00:20:31 +0200 |
| commit | de3afce5336af3214374de6df360f9eb010a9a36 (patch) | |
| tree | e3b4774907877c101796e9ce4af2c0ed285631a0 | |
| parent | 25d6db963c6eec38ba542e08f9b5fe40761a9177 (diff) | |
| parent | 3eba563e280101209bad27d40bfc83ddf1489234 (diff) | |
| parent | 4985c32ee4241d1aba1beeac72294faa46aaff10 (diff) | |
Merge branches 'acpi-ec' and 'acpi-processor'pm+acpi-3.15-rc4
* acpi-ec:
ACPI / EC: Process rather than discard events in acpi_ec_clear
* acpi-processor:
ACPI / processor: Fix failure of loading acpi-cpufreq driver