From: Rafael J. Wysocki Date: Fri, 31 Oct 2014 21:24:44 +0000 (+0100) Subject: Merge branches 'acpi-scan' and 'acpi-ec' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=76dfdc2c6ed8cd9dde0d18091c2cf41b1e378be4;p=linux-beck.git Merge branches 'acpi-scan' and 'acpi-ec' * acpi-scan: ACPI: Use ACPI companion to match only the first physical device * acpi-ec: ACPI / EC: Fix regression due to conflicting firmware behavior between Samsung and Acer. Revert "ACPI / EC: Add support to disallow QR_EC to be issued before completing previous QR_EC" --- 76dfdc2c6ed8cd9dde0d18091c2cf41b1e378be4