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
..
boot	arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS	2011-11-15 17:13:15 +08:00
configs	unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig)	2011-06-09 16:24:42 +08:00
include	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 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
lib	unicore32: fix build error for find bitops	2011-11-15 17:13:14 +08:00
mm	memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users	2011-12-08 10:22:08 -08:00
.gitignore
Kconfig	lib: move GENERIC_IOMAP to lib/Kconfig	2011-11-24 22:21:19 +02:00
Kconfig.debug	unicore32: drop unused Kconfig symbols	2011-11-15 17:13:18 +08:00
Makefile	unicore32: using generic-y format for one line asm-generic files	2011-06-09 16:29:52 +08:00