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: v6k: Dove platforms use V6K architecture CPUs	2011-02-02 21:23:27 +00:00
Makefile	[ARM] Dove: add support for multi-purpose pins configuration	2010-12-15 10:32:30 -05:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
addr-map.c	ARM: Orion: mbus_dram_info consolidation	2011-12-13 18:46:55 -05:00
cm-a510.c	ARM: restart: dove: use new restart hook	2012-01-05 12:57:09 +00:00
common.c	New feature development	2012-01-09 14:38:51 -08:00
common.h	New feature development	2012-01-09 14:38:51 -08:00
dove-db-setup.c	ARM: restart: dove: use new restart hook	2012-01-05 12:57:09 +00:00
irq.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
mpp.c	ARM: dove: Consolidate mpp code with platform mpp.	2011-05-16 15:49:31 -04:00
mpp.h	ARM: dove: Consolidate mpp code with platform mpp.	2011-05-16 15:49:31 -04:00
pcie.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00