linux/arch/mips/pci
Linus Torvalds d6748066ad Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)
  MIPS: O32: Provide definition of registers ta0 .. ta3.
  MIPS: perf: Add Octeon support for hardware perf.
  MIPS: perf: Add support for 64-bit perf counters.
  MIPS: perf: Reorganize contents of perf support files.
  MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
  MIPS: Add accessor macros for 64-bit performance counter registers.
  MIPS: Add probes for more Octeon II CPUs.
  MIPS: Add more CPU identifiers for Octeon II CPUs.
  MIPS: XLR, XLS: Add comment for smp setup
  MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
  MIPS: JZ4740: GPIO: Simplify IRQ demuxer
  MIPS: JZ4740: Use generic irq chip
  MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
  MIPS: Alchemy: kill au1xxx.h header
  MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
  MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
  MIPS: Alchemy: Redo PCI as platform driver
  MIPS: Alchemy: more base address cleanup
  MIPS: Alchemy: rewrite USB platform setup.
  MIPS: Alchemy: abstract USB block control register access
  ...

Fix up trivial conflicts in:
	arch/mips/alchemy/devboards/db1x00/platform.c
	drivers/ide/Kconfig
	drivers/mmc/host/au1xmmc.c
	drivers/video/Kconfig
	sound/mips/Kconfig
2011-11-03 13:28:14 -07:00
..
fixup-bcm63xx.c
fixup-capcella.c
fixup-cobalt.c
fixup-emma2rh.c
fixup-fuloong2e.c
fixup-ip32.c
fixup-jmr3927.c
fixup-lemote2f.c
fixup-malta.c
fixup-mpc30x.c
fixup-pmcmsp.c
fixup-pnx8550.c
fixup-rbtx4927.c
fixup-rbtx4938.c
fixup-rc32434.c
fixup-sb1250.c
fixup-sni.c
fixup-tb0219.c
fixup-tb0226.c
fixup-tb0287.c
fixup-wrppmc.c
fixup-yosemite.c
Makefile MIPS: Alchemy: Redo PCI as platform driver 2011-10-24 23:34:24 +01:00
msi-octeon.c
ops-bcm63xx.c
ops-bonito64.c
ops-bridge.c
ops-emma2rh.c
ops-gt64xxx_pci0.c
ops-lantiq.c
ops-loongson2.c
ops-mace.c
ops-msc.c
ops-nile4.c
ops-pmcmsp.c
ops-pnx8550.c
ops-rc32434.c
ops-sni.c
ops-titan-ht.c
ops-titan.c
ops-tx3927.c
ops-tx4927.c
ops-vr41xx.c
pci-alchemy.c MIPS: Alchemy: Redo PCI as platform driver 2011-10-24 23:34:24 +01:00
pci-bcm47xx.c bcm47xx: make it possible to build bcm47xx without ssb. 2011-08-08 14:29:31 -04:00
pci-bcm63xx.c
pci-bcm63xx.h
pci-bcm1480.c
pci-bcm1480ht.c
pci-emma2rh.c
pci-ip27.c
pci-ip32.c
pci-lantiq.c MIPS: Lantiq: Fix setting the PCI bus speed on AR9 2011-09-21 17:53:18 +02:00
pci-lantiq.h
pci-lasat.c
pci-octeon.c
pci-rc32434.c MIPS: RC32434: Fix PCI build error 2011-09-21 17:51:57 +02:00
pci-sb1250.c
pci-tx4927.c
pci-tx4938.c
pci-tx4939.c
pci-vr41xx.c
pci-vr41xx.h
pci-xlr.c
pci-yosemite.c
pci.c
pcie-octeon.c