summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-03 23:10:06 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-03 23:10:06 +0200
commit91ab377ba3ab202c40a0da402d6c2f1507a15355 (patch)
treebe13e8a80803e3979fcdc4a2bf2af21d8e49f5c5 /include
parent26f8784e2d7b9294399ce8f8b276beeb40201345 (diff)
parent73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 (diff)
parent72013795a73f8536d3346fa90379c987bcad0cc8 (diff)
downloadlinux-91ab377ba3ab202c40a0da402d6c2f1507a15355.tar.bz2
Merge branches 'acpi-tables' and 'acpi-general'
* acpi-tables: ACPI: Fix conflict between customized DSDT and DSDT local copy * acpi-general: ACPI: Add acpi_bus_attach_private_data() to attach data to ACPI handle