Linus Torvalds 4406c56d0a Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ... * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (75 commits) PCI hotplug: clean up acpi_run_hpp() PCI hotplug: acpiphp: use generic pci_configure_slot() PCI hotplug: shpchp: use generic pci_configure_slot() PCI hotplug: pciehp: use generic pci_configure_slot() PCI hotplug: add pci_configure_slot() PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface PCI hotplug: acpiphp: don't cache hotplug_params in acpiphp_bridge PCI hotplug: acpiphp: remove superfluous _HPP/_HPX evaluation PCI: Clear saved_state after the state has been restored PCI PM: Return error codes from pci_pm_resume() PCI: use dev_printk in quirk messages PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset() PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle PCI Hotplug: acpiphp: find bridges the easy way PCI: pcie portdrv: remove unused variable PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI support ACPI PM: Replace wakeup.prepared with reference counter PCI PM: Introduce device flag wakeup_prepared PCI / ACPI PM: Rework some debug messages PCI PM: Simplify PCI wake-up code ... Fixed up conflict in arch/powerpc/kernel/pci_64.c due to OF device tree scanning having been moved and merged for the 32- and 64-bit cases. The 'needs_freset' initialization added in 6e19314cc ("PCI/powerpc: support PCIe fundamental reset") is now in arch/powerpc/kernel/pci_of_scan.c.		2009-09-16 07:49:54 -07:00
..
acpi.c	x86/PCI: get root CRS before scanning children	2009-06-30 13:44:24 -07:00
amd_bus.c	x86/PCI: initialize PCI bus node numbers early	2009-09-09 13:29:21 -07:00
common.c	x86/PCI: initialize PCI bus node numbers early	2009-09-09 13:29:21 -07:00
direct.c	dmi: extend dmi_get_year() to dmi_get_date()	2009-09-08 21:17:48 -04:00
early.c
fixup.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-04-01 09:47:12 -07:00
i386.c	x86/pci: insert ioapic resource before assigning unassigned resources	2009-07-10 13:03:14 -07:00
init.c
irq.c	x86, apic: introduce io_apic_irq_attr	2009-05-18 08:38:55 +02:00
legacy.c
Makefile
mmconfig_32.c
mmconfig_64.c
mmconfig-shared.c	ACPI, PCI, x86: move MCFG parsing routine from ACPI to PCI file	2009-06-12 20:50:38 -04:00
numaq_32.c
olpc.c
pcbios.c
visws.c