]> 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)
commit9a61f01072b5491721c9121ff20747a36fa094ac
treebe13e8a80803e3979fcdc4a2bf2af21d8e49f5c5
parente2fec7043c1bb08b7f59f341cf3778bd4d9a8ff5
parente262dcc859d939df77290dbca7781ee0aebd3330
parent62b1947bd214467636bd23df33ecd95ae9fe4b50
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