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
..
arch.h	devicetree/next changes queued for v3.3 merge window	2012-01-07 12:18:52 -08:00
dma.h	[ARM] dma: move IOMD and floppy DMA structures to RiscPC DMA code	2009-02-21 21:36:22 +00:00
flash.h	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
irda.h	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
irq.h	ARM: 6806/1: irq: introduce entry and exit functions for chained handlers	2011-03-15 09:42:28 +00:00
map.h	ARM: mm: Add strongly ordered descriptor support.	2011-09-23 12:05:30 +05:30
pci.h	arm/PCI: convert to pci_scan_root_bus() for correct root bus resources	2012-01-06 12:10:56 -08:00
serial_at91.h	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
serial_sa1100.h	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
sharpsl_param.h	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
time.h	arm: time.h: remove device.h #include	2011-12-22 09:46:36 -08:00
udc_pxa2xx.h	ARM: pxa: drop gpio_vbus field from pxa2xx_udc_mach_info	2011-03-16 16:33:34 +08:00