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
..
configs	Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux	2011-11-02 16:52:17 -07:00
dig	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
hp	ia64: Add export.h to arch/ia64 specific files as required	2011-10-31 19:30:58 -04:00
include/asm	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
kernel	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	2012-01-10 11:08:21 -08:00
kvm	KVM: IA64: fix struct redefinition	2011-12-27 11:17:43 +02:00
lib	Fix common misspellings	2011-03-31 11:26:23 -03:00
mm	ia64: Use HAVE_MEMBLOCK_NODE_MAP	2011-12-08 10:22:08 -08:00
oprofile	[IA64] fix build warning in arch/ia64/oprofile/backtrace.c	2011-04-07 11:05:56 -07:00
pci	ia64/PCI: convert to pci_create_root_bus() for correct root bus resources	2012-01-06 12:10:58 -08:00
scripts	scripts: change scripts to use system python instead of env	2010-02-02 14:33:56 +01:00
sn	ia64: pcibr: Use kmemdup rather than duplicating its implementation	2011-12-09 15:22:44 -08:00
uv	ia64: change to new flag variables	2011-03-17 14:02:56 +01:00
xen	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
Kconfig	lib: use generic pci_iomap on all architectures	2012-01-10 18:04:27 -08:00
Kconfig.debug	[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu	2005-11-07 07:53:35 -08:00
Makefile	Merge commit 'v2.6.35' into kbuild/kbuild	2010-08-04 13:59:13 +02:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
module.lds	…