![]() * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (72 commits) Revert "x86/PCI: ACPI based PCI gap calculation" PCI: remove unnecessary volatile in PCIe hotplug struct controller x86/PCI: ACPI based PCI gap calculation PCI: include linux/pm_wakeup.h for device_set_wakeup_capable PCI PM: Fix pci_prepare_to_sleep x86/PCI: Fix PCI config space for domains > 0 Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n PCI: Simplify PCI device PM code PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep PCI ACPI: Rework PCI handling of wake-up ACPI: Introduce new device wakeup flag 'prepared' ACPI: Introduce acpi_device_sleep_wake function PCI: rework pci_set_power_state function to call platform first PCI: Introduce platform_pci_power_manageable function ACPI: Introduce acpi_bus_power_manageable function PCI: make pci_name use dev_name PCI: handle pci_name() being const PCI: add stub for pci_set_consistent_dma_mask() PCI: remove unused arch pcibios_update_resource() functions PCI: fix pci_setup_device()'s sprinting into a const buffer ... Fixed up conflicts in various files (arch/x86/kernel/setup_64.c, arch/x86/pci/irq.c, arch/x86/pci/pci.h, drivers/acpi/sleep/main.c, drivers/pci/pci.c, drivers/pci/pci.h, include/acpi/acpi_bus.h) from x86 and ACPI updates manually. |
||
---|---|---|
.. | ||
platform | ||
acconfig.h | ||
acdebug.h | ||
acdisasm.h | ||
acdispat.h | ||
acevents.h | ||
acexcep.h | ||
acglobal.h | ||
achware.h | ||
acinterp.h | ||
aclocal.h | ||
acmacros.h | ||
acnames.h | ||
acnamesp.h | ||
acobject.h | ||
acopcode.h | ||
acoutput.h | ||
acparser.h | ||
acpi.h | ||
acpi_bus.h | ||
acpi_drivers.h | ||
acpi_numa.h | ||
acpiosxf.h | ||
acpixf.h | ||
acresrc.h | ||
acstruct.h | ||
actables.h | ||
actbl.h | ||
actbl1.h | ||
actypes.h | ||
acutils.h | ||
amlcode.h | ||
amlresrc.h | ||
container.h | ||
pdc_intel.h | ||
processor.h | ||
reboot.h |