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
..
include/mach	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
Kconfig	ARM: 6520/1: Kconfig: add new symbol MIGHT_HAVE_PCI	2010-12-05 08:39:30 +00:00
Makefile	ARM: cns3xxx: Add support for SDHCI controllers	2010-06-08 17:37:09 +04:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
cns3420vb.c	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
core.c	ARM: cns3xxx: Add support for L2 Cache Controller	2011-07-07 18:48:38 +04:00
core.h	ARM: restart: cns3xxx: use new restart hook	2012-01-05 12:57:09 +00:00
devices.c	ARM: cns3xxx: Add new and export the old power management functions	2010-11-26 21:10:50 +03:00
devices.h	ARM: cns3xxx: Add support for AHCI controllers	2010-06-08 17:37:09 +04:00
pcie.c	arm/PCI: convert to pci_scan_root_bus() for correct root bus resources	2012-01-06 12:10:56 -08:00
pm.c	ARM: restart: cns3xxx: use new restart hook	2012-01-05 12:57:09 +00:00