summaryrefslogtreecommitdiff
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-23 23:02:09 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-23 23:02:09 +0200
commit286180d8d327c8f9d91e90980adcaece07dd0754 (patch)
tree4e8c0fc5a3ff1225c1cf61af1891ca2e05dd49e5 /kernel/power
parent082c119da469ae3f68740d7866776c1bd4a9dda7 (diff)
parent7a73e60e398a61612651d503aef9c81260d33918 (diff)
parent8a2f38ddfeb526c30b3ec209468172a30a38d996 (diff)
Merge branches 'acpi-ec' and 'acpi-platform'
* acpi-ec: ACPI / EC: Cleanup coding style. ACPI / EC: Refine event/query debugging messages. ACPI / EC: Add detailed command/query debugging information. ACPI / EC: Enhance the logs to apply to QR_EC transactions. ACPI / EC: Add CPU ID to debugging messages. * acpi-platform: ACPI / platform: provide default DMA mask