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
..
2008-03-10 18:01:20 -07:00
2009-04-01 08:59:31 -07:00
2009-06-16 19:47:59 -07:00
2009-04-01 08:59:32 -07:00
2009-01-12 20:56:32 +01:00
2008-07-24 10:47:34 -07:00
2009-06-16 19:47:58 -07:00
2008-05-18 13:28:49 -07:00
2009-09-23 07:39:51 -07:00
2009-05-06 16:36:10 -07:00
2009-12-07 18:36:35 +01:00
2009-07-07 11:50:57 +09:00
2009-09-21 15:14:58 +02:00
2009-12-09 12:04:33 +02:00
2008-04-28 08:58:41 -07:00
2009-01-06 15:59:27 -08:00
2009-01-06 15:59:27 -08:00
2009-03-17 09:30:36 +09:00
2009-12-04 15:39:52 +01:00
2009-04-01 08:59:31 -07:00
2009-04-01 08:59:31 -07:00
2008-10-16 11:21:42 -07:00