diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-25 11:26:36 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-25 11:26:36 -0700 |
| commit | a2766602ac6885f9514abd97821984cd152cdad3 (patch) | |
| tree | 8932650a9accababfcc37daf515aa75cb0df7749 /drivers/crypto | |
| parent | 295a7f6235bfa21be3454aebc1bea1eaf0b74fb7 (diff) | |
| parent | b8bd759acd05281abf88cddef30c57313c109697 (diff) | |
| download | blackbird-op-linux-a2766602ac6885f9514abd97821984cd152cdad3.tar.gz blackbird-op-linux-a2766602ac6885f9514abd97821984cd152cdad3.zip | |
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.
Diffstat (limited to 'drivers/crypto')
0 files changed, 0 insertions, 0 deletions
