summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-03 00:20:31 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-03 00:20:31 +0200
commitde3afce5336af3214374de6df360f9eb010a9a36 (patch)
treee3b4774907877c101796e9ce4af2c0ed285631a0 /drivers/acpi
parent25d6db963c6eec38ba542e08f9b5fe40761a9177 (diff)
parent3eba563e280101209bad27d40bfc83ddf1489234 (diff)
parent4985c32ee4241d1aba1beeac72294faa46aaff10 (diff)
Merge branches 'acpi-ec' and 'acpi-processor'
* acpi-ec: ACPI / EC: Process rather than discard events in acpi_ec_clear * acpi-processor: ACPI / processor: Fix failure of loading acpi-cpufreq driver