]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'acpi-tables' and 'acpi-general'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:10:06 +0000 (23:10 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:10:06 +0000 (23:10 +0200)
commit82b8d7d5f17af26a7d925e1a4a084cf5acaeadc7
treebe13e8a80803e3979fcdc4a2bf2af21d8e49f5c5
parentf966c570e2e109dcb89ca79d2f86ed52ce34ab1a
parent8d90c570e90a1394f98362d70506d32556ad6ebf
parent514fa22cfd07b83adc633ad19deb00f4829ff70f
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
drivers/acpi/bus.c