Linus Torvalds 11bd04f6f3 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: (109 commits)
  PCI: fix coding style issue in pci_save_state()
  PCI: add pci_request_acs
  PCI: fix BUG_ON triggered by logical PCIe root port removal
  PCI: remove ifdefed pci_cleanup_aer_correct_error_status
  PCI: unconditionally clear AER uncorr status register during cleanup
  x86/PCI: claim SR-IOV BARs in pcibios_allocate_resource
  PCI: portdrv: remove redundant definitions
  PCI: portdrv: remove unnecessary struct pcie_port_data
  PCI: portdrv: minor cleanup for pcie_port_device_register
  PCI: portdrv: add missing irq cleanup
  PCI: portdrv: enable device before irq initialization
  PCI: portdrv: cleanup service irqs initialization
  PCI: portdrv: check capabilities first
  PCI: portdrv: move PME capability check
  PCI: portdrv: remove redundant pcie type calculation
  PCI: portdrv: cleanup pcie_device registration
  PCI: portdrv: remove redundant pcie_port_device_probe
  PCI: Always set prefetchable base/limit upper32 registers
  PCI: read-modify-write the pcie device control register when initiating pcie flr
  PCI: show dma_mask bits in /sys
  ...

Fixed up conflicts in:
	arch/x86/kernel/amd_iommu_init.c
	drivers/pci/dmar.c
	drivers/pci/hotplug/acpiphp_glue.c

2009-12-11 12:18:16 -08:00

..

acpi_pcihp.c

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2009-12-11 12:18:16 -08:00

acpiphp_core.c

PCI hotplug: remove redundant .owner initializations

2009-06-16 14:30:12 -07:00

acpiphp_glue.c

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2009-12-11 12:18:16 -08:00

acpiphp_ibm.c

ACPICA: Add post-order callback to acpi_walk_namespace

2009-11-24 21:31:10 -05:00

acpiphp.h

PCI hotplug: move IOAPIC support from acpiphp to ioapic driver

2009-11-04 13:06:39 -08:00

cpci_hotplug_core.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

cpci_hotplug_pci.c

PCI: cpci_hotplug: stop managing hotplug_slot->name

2008-10-22 16:42:39 -07:00

cpci_hotplug.h

PCI: cpci_hotplug: stop managing hotplug_slot->name

2008-10-22 16:42:39 -07:00

cpcihp_generic.c

PCI Hotplug: make cpcihp driver use modern apis

2008-04-20 21:46:56 -07:00

cpcihp_zt5550.c

PCI: ZT5550 CPCI Hotplug driver fix

2007-05-02 19:02:40 -07:00

cpcihp_zt5550.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cpqphp_core.c

PCI hotplug: remove redundant .owner initializations

2009-06-16 14:30:12 -07:00

cpqphp_ctrl.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

cpqphp_nvram.c

PCI Hotplug: cpqphp: fix comment style

2009-06-11 12:04:08 -07:00

cpqphp_nvram.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cpqphp_pci.c

PCI Hotplug: cpqphp: don't use pci_find_slot()

2009-06-11 12:04:16 -07:00

cpqphp_sysfs.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

cpqphp.h

headers: Fix build after <linux/sched.h> removal

2009-10-13 10:20:16 -07:00

fakephp.c

PCI: update fakephp for bus_id removal

2009-03-26 16:00:34 -07:00

ibmphp_core.c

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2009-06-22 11:59:51 -07:00

ibmphp_ebda.c

PCI: ibmphp: stop managing hotplug_slot->name

2008-10-22 16:42:41 -07:00

ibmphp_hpc.c

PCI: ibmphp_hpc: don't release hw sem twice if kthread stops

2009-12-04 15:18:01 -08:00

ibmphp_pci.c

PCI: replace remaining __FUNCTION__ occurrences

2008-04-20 21:47:09 -07:00

ibmphp_res.c

PCI: replace remaining __FUNCTION__ occurrences

2008-04-20 21:47:09 -07:00

ibmphp.h

PCI: ibmphp: stop managing hotplug_slot->name

2008-10-22 16:42:41 -07:00

Kconfig

PCI: drivers/pci/slot.c should depend on CONFIG_SYSFS

2009-06-18 13:57:24 -07:00

Makefile

PCI hotplug: acpiphp should be linked after vendor drivers

2009-11-04 08:47:14 -08:00

pci_hotplug_core.c

PCI hotplug: change PCI nomenclature

2009-11-04 08:47:13 -08:00

pciehp_acpi.c

pciehp: use pci_pcie_cap()

2009-11-24 15:25:15 -08:00

pciehp_core.c

PCI: pciehp: prevent unnecessary power off

2009-11-04 09:02:35 -08:00

pciehp_ctrl.c

PCI pciehp: fix power fault interrupt storm problem

2009-11-24 15:25:19 -08:00

pciehp_hpc.c

PCI pciehp: fix power fault interrupt storm problem

2009-11-24 15:25:19 -08:00

pciehp_pci.c

PCI: pciehp: remove hpc_ops

2009-09-17 10:06:31 -07:00

pciehp.h

pciehp: use pci_pcie_cap()

2009-11-24 15:25:15 -08:00

pcihp_skeleton.c

PCI hotplug: remove redundant .owner initializations

2009-06-16 14:30:12 -07:00

pcihp_slot.c

PCI hotplug: use pci_is_pcie()

2009-11-24 15:25:18 -08:00

rpadlpar_core.c

powerpc/pci: Fix various pseries PCI hotplug issues

2008-11-06 09:31:52 +11:00

rpadlpar_sysfs.c

PCI: introduce pci_slot

2008-06-10 14:37:03 -07:00

rpadlpar.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rpaphp_core.c

PCI hotplug: remove redundant .owner initializations

2009-06-16 14:30:12 -07:00

rpaphp_pci.c

PCI hotplug: rpaphp: make debug var unique

2008-10-20 10:54:27 -07:00

rpaphp_slot.c

PCI: rpaphp: kmalloc/kfree slot->name directly

2008-10-22 16:42:42 -07:00

rpaphp.h

PCI hotplug: rpaphp: make debug var unique

2008-10-20 10:54:27 -07:00

sgi_hotplug.c

PCI hotplug: SGI hotplug: do not use hotplug_slot_attr

2009-08-07 10:36:27 -07:00

shpchp_core.c

PCI hotplug: remove redundant .owner initializations

2009-06-16 14:30:12 -07:00

shpchp_ctrl.c

PCI hotplug: shpchp: message refinement

2008-10-23 16:14:00 -07:00

shpchp_hpc.c

PCI hotplug: shpchp: message refinement

2008-10-23 16:14:00 -07:00

shpchp_pci.c

PCI hotplug: shpchp: use generic pci_configure_slot()

2009-09-14 17:39:11 -07:00

shpchp_sysfs.c

SHPCHP: fix __must_check warnings

2006-09-26 17:43:53 -07:00

shpchp.h

PCI hotplug: shpchp: use generic pci_configure_slot()

2009-09-14 17:39:11 -07:00