]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'acpi-assorted-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 31 Jul 2013 12:00:21 +0000 (14:00 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 31 Jul 2013 12:00:21 +0000 (14:00 +0200)
commit847379133ef202fb25195cd6045d0dd6b75fedc2
tree9cbe7237b11ccb12661d2ec479bfed7cc39aab68
parentec179bce5a802c31ee5b9f39a9e0f43f268d474b
parent3706231332d57072e0e2c0e59975443f3f18e673
Merge branch 'acpi-assorted-next' into linux-next

* acpi-assorted-next:
  ACPI: blacklist win8 OSI for ASUS Zenbok Prime UX31A
  ACPI: Move acpi_bus_get_device() from bus.c to scan.c
drivers/acpi/bus.c
drivers/acpi/scan.c
include/acpi/acpi_bus.h