From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 31 Jul 2013 12:00:21 +0000 (+0200)
Subject: Merge branch 'acpi-assorted-next' into linux-next
X-Git-Tag: next-20130802~72^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=847379133ef202fb25195cd6045d0dd6b75fedc2;p=karo-tx-linux.git

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
---

847379133ef202fb25195cd6045d0dd6b75fedc2