WSL2-Linux-Kernel/arch/arm/mach-ixp4xx
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 ixp4xx: support omicron ixp425 based boards 2011-09-30 22:18:42 +02:00
Makefile ixp4xx: support omicron ixp425 based boards 2011-09-30 22:18:42 +02:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
avila-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
avila-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
common-pci.c arm/PCI: convert to pci_scan_root_bus() for correct root bus resources 2012-01-06 12:10:56 -08:00
common.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
coyote-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
coyote-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
dsmg600-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
dsmg600-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
fsg-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
fsg-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
gateway7001-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
gateway7001-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
goramo_mlr.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
gtwx5715-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
gtwx5715-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
ixdp425-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
ixdp425-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
ixdpg425-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
ixp4xx_npe.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ixp4xx_qmgr.c IXP4xx: Fix qmgr_release_queue() flushing unexpected queue entries. 2011-02-06 16:49:48 +01:00
miccpt-pci.c ixp4xx: support omicron ixp425 based boards 2011-09-30 22:18:42 +02:00
nas100d-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
nas100d-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
nslu2-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
nslu2-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
omixp-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
vulcan-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
vulcan-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00
wg302v2-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
wg302v2-setup.c ARM: restart: ixp4xx: use new restart hook 2012-01-05 12:57:14 +00:00