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 |
| .. |
|
isapnp
|
Merge branch 'linus' into test
|
2008-10-23 00:11:07 -04:00 |
|
pnpacpi
|
ACPI: remove acpi_device.flags.hardware_id
|
2009-09-25 15:09:48 -04:00 |
|
pnpbios
|
tree-wide: fix assorted typos all over the place
|
2009-12-04 15:39:55 +01:00 |
|
base.h
|
Merge branch 'linus' into test
|
2008-10-23 00:11:07 -04:00 |
|
card.c
|
dma-mapping: replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24)
|
2009-04-07 08:31:12 -07:00 |
|
core.c
|
dma-mapping: replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24)
|
2009-04-07 08:31:12 -07:00 |
|
driver.c
|
pnp: add a shutdown method to pnp drivers
|
2009-09-22 07:17:49 -07:00 |
|
interface.c
|
drivers: remove duplicated #include
|
2008-11-04 08:18:19 -08:00 |
|
Kconfig
|
PNP: remove old CONFIG_PNP_DEBUG option
|
2008-10-10 23:35:33 -04:00 |
|
Makefile
|
Merge branch 'linus' into test
|
2008-10-23 00:11:07 -04:00 |
|
manager.c
|
PNP: convert to using pnp_dbg()
|
2008-10-10 23:34:33 -04:00 |
|
quirks.c
|
vsprintf: use %pR, %pr instead of %pRt, %pRf
|
2009-11-04 13:06:41 -08:00 |
|
resource.c
|
vsprintf: use %pR, %pr instead of %pRt, %pRf
|
2009-11-04 13:06:41 -08:00 |
|
support.c
|
vsprintf: use %pR, %pr instead of %pRt, %pRf
|
2009-11-04 13:06:41 -08:00 |
|
system.c
|
vsprintf: use %pR, %pr instead of %pRt, %pRf
|
2009-11-04 13:06:41 -08:00 |