Linus Torvalds 7b67e75147 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci ... * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits) x86/PCI: Expand the x86_msi_ops to have a restore MSIs. PCI: Increase resource array mask bit size in pcim_iomap_regions() PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT) PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB x86/PCI: amd: factor out MMCONFIG discovery PCI: Enable ATS at the device state restore PCI: msi: fix imbalanced refcount of msi irq sysfs objects PCI: kconfig: English typo in pci/pcie/Kconfig PCI/PM/Runtime: make PCI traces quieter PCI: remove pci_create_bus() xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus() x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented() x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources sparc/PCI: convert to pci_create_root_bus() sh/PCI: convert to pci_scan_root_bus() for correct root bus resources powerpc/PCI: convert to pci_create_root_bus() powerpc/PCI: split PHB part out of pcibios_map_io_space() ... Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due to the same patches being applied in other branches.		2012-01-11 18:50:26 -08:00
..
Makefile	frv: switch to GENERIC_PCI_IOMAP	2011-12-04 16:00:12 +02:00
flash.c	FRV: Flash mappings for the MB93090-MB00 motherboard	2009-09-24 17:18:38 -07:00
pci-dma-nommu.c	dma-mapping: frv: remove the obsolete and unnecessary DMA API comments	2010-03-12 15:52:42 -08:00
pci-dma.c	mm: stack based kmap_atomic()	2010-10-26 16:52:08 -07:00
pci-frv.c	PCI: frv: use generic pcibios_set_master()	2012-01-06 12:10:43 -08:00
pci-frv.h	PCI: Pull PCI 'latency timer' setup up into the core	2012-01-06 12:10:42 -08:00
pci-irq.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
pci-vdk.c	frv/PCI: convert to pci_scan_root_bus() for correct root bus resources	2012-01-06 12:10:57 -08:00