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
..
cmm.c
dtl.c	powerpc: pseries/dtl.c should include asm/firmware.h	2009-04-15 15:23:55 +10:00
eeh_cache.c
eeh_driver.c	PCI AER: support Multiple Error Received and no error source id	2009-06-16 14:30:13 -07:00
eeh_event.c
eeh_sysfs.c
eeh.c	PCI/powerpc: support PCIe fundamental reset	2009-09-09 13:29:41 -07:00
firmware.c
hotplug-cpu.c
hotplug-memory.c
hvCall_inst.c
hvCall.S
hvconsole.c
hvcserver.c
iommu.c	powerpc/pseries: Fix warnings when printing resource_size_t	2009-06-09 16:47:39 +10:00
Kconfig	powerpc: Add virtual processor dispatch trace log	2009-03-24 13:47:28 +11:00
kexec.c
lpar.c	powerpc/pseries: Use pr_devel() in pseries LPAR HPTE routines	2009-07-08 13:50:21 +10:00
Makefile	powerpc: Add virtual processor dispatch trace log	2009-03-24 13:47:28 +11:00
msi.c	powerpc/pseries: Reject discontiguous/non-zero based MSI-X requests	2009-03-11 17:11:33 +11:00
nvram.c
pci_dlpar.c	powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()	2009-09-02 15:45:53 +10:00
pci.c
phyp_dump.c
plpar_wrappers.h	powerpc: Add virtual processor dispatch trace log	2009-03-24 13:47:28 +11:00
power.c
pseries.h
ras.c
reconfig.c	powerpc/pseries: Fix to handle slb resize across migration	2009-09-02 16:19:01 +10:00
rtasd.c	powerpc: Convert RTAS event scan from kernel thread to workqueue	2009-06-02 10:35:32 +10:00
scanlog.c
setup.c	powerpc: Fix bug where perf_counters breaks oprofile	2009-09-11 11:27:58 +10:00
smp.c	powerpc: Move definitions of secondary CPU spinloop to header file	2009-08-20 10:12:44 +10:00
xics.c	powerpc/pseries: Use pr_devel() in xics.c	2009-07-08 13:50:21 +10:00
xics.h