diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2013-01-10 11:18:41 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-10 11:18:41 -0700 |
| commit | 295a7f6235bfa21be3454aebc1bea1eaf0b74fb7 (patch) | |
| tree | ae253b12eb331e1d093a3f348b4f8045e80f5e53 /arch/ia64/pci/pci.c | |
| parent | x86/PCI: Implement pcibios_resource_survey_bus() (diff) | |
| parent | ACPI / scan: Treat power resources in a special way (diff) | |
| download | linux-dev-295a7f6235bfa21be3454aebc1bea1eaf0b74fb7.tar.xz linux-dev-295a7f6235bfa21be3454aebc1bea1eaf0b74fb7.zip | |
Merge branch 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into pci/yinghai-survey-resources+acpi-scan
* 'acpi-scan' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / scan: Treat power resources in a special way
ACPI: Remove unused struct acpi_pci_root.id member
ACPI: Drop ACPI device .bind() and .unbind() callbacks
ACPI / PCI: Move the _PRT setup and cleanup code to pci-acpi.c
ACPI / PCI: Rework the setup and cleanup of device wakeup
ACPI: Add .setup() and .cleanup() callbacks to struct acpi_bus_type
ACPI: Make acpi_bus_scan() and acpi_bus_add() take only one argument
ACPI: Replace ACPI device add_type field with a match_driver flag
ACPI: Drop the second argument of acpi_bus_scan()
ACPI: Remove the arguments of acpi_bus_add() that are not used
ACPI: Remove acpi_start_single_object() and acpi_bus_start()
ACPI / PCI: Fold acpi_pci_root_start() into acpi_pci_root_add()
ACPI: Change the ordering of acpi_bus_check_add()
ACPI: Replace struct acpi_bus_ops with enum type
ACPI: Reduce the usage of struct acpi_bus_ops
ACPI: Make acpi_bus_add() and acpi_bus_start() visibly different
ACPI: Change the ordering of PCI root bridge driver registrarion
ACPI: Separate adding ACPI device objects from probing ACPI drivers
Conflicts:
drivers/acpi/pci_root.c
Diffstat (limited to 'arch/ia64/pci/pci.c')
0 files changed, 0 insertions, 0 deletions