From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sun, 27 Jan 2013 00:35:05 +0000 (-0700)
Subject: Merge branch 'pci/acpi-scan2' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fb455792d91469fe556b68f1baa9ff5493432be8;p=linux-beck.git

Merge branch 'pci/acpi-scan2' into next

* pci/acpi-scan2:
  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.
---

fb455792d91469fe556b68f1baa9ff5493432be8