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