]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec179bc 3706231)
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)
* acpi-assorted-next:
  ACPI: blacklist win8 OSI for ASUS Zenbok Prime UX31A
  ACPI: Move acpi_bus_get_device() from bus.c to scan.c

1  2 
drivers/acpi/bus.c patch | diff1 | diff2 | blob | history
drivers/acpi/scan.c patch | diff1 | diff2 | blob | history
include/acpi/acpi_bus.h patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/bus.c
Simple merge
diff --cc drivers/acpi/scan.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
Linux kernel for KaRo TX COM modules