From: Bjorn Helgaas Date: Fri, 25 Jan 2013 18:26:36 +0000 (-0700) Subject: Merge branch 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~13054^2~8^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a2766602ac6885f9514abd97821984cd152cdad3;p=mirror_ubuntu-artful-kernel.git Merge branch 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into pci/acpi-scan2 * 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / scan: Drop acpi_bus_add() and use acpi_bus_scan() instead ACPI: update ej_event interface to take acpi_device ACPI / scan: Add second pass to acpi_bus_trim() ACPI / scan: Change the implementation of acpi_bus_trim() ACPI / scan: Drop the second argument of acpi_bus_trim() ACPI / scan: Drop the second argument of acpi_device_unregister() ACPI: Remove the ops field from struct acpi_device ACPI: remove unused acpi_op_bind and acpi_op_unbind ACPI / scan: Fix check of device_attach() return value. --- a2766602ac6885f9514abd97821984cd152cdad3