]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 528e451 73577d1 8ce62f8)
Merge branches 'acpi-tables' and 'acpi-platform'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:28:20 +0000 (18:28 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:28:20 +0000 (18:28 +0200)
commit3830486107c2ddfe288099c258626e09a19452be
treefec32918ecffb129f6cbb27e402fc46b80499172tree | snapshot
parent528e4516c923b01c99cda8d4c6b538ec24acbfe2commit | diff
parent73577d1df8e1f31f6b1a5eebcdbc334eb0330e47commit | diff
parent8ce62f85a81f57e86bc120ab690facc612223188commit | diff
Merge branches 'acpi-tables' and 'acpi-platform'

* acpi-tables:
  ACPI: Fix conflict between customized DSDT and DSDT local copy

* acpi-platform:
  ACPI / platform / LPSS: Enable async suspend/resume of LPSS devices
  ACPI / platform: add IDs for Broadcom Bluetooth and GPS chips
drivers/acpi/acpi_platform.c diff1 | diff2 | diff3 | blob | history
drivers/acpi/bus.c diff1 | diff2 | diff3 | blob | history
Linux kernel for KaRo TX COM modules