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

MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.

2009-09-17 20:07:52 +02:00

fixup-capcella.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

fixup-cobalt.c

MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses

2010-02-27 12:53:44 +01:00

fixup-emma2rh.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

fixup-fuloong2e.c

Fix typo configue => configure in comments

2010-09-23 11:46:50 +02:00

fixup-ip32.c

…

fixup-jmr3927.c

…

fixup-lemote2f.c

MIPS: Loongson: Lemote-2F: USB: Not Emulate Non-Posted Writes

2010-02-27 12:53:09 +01:00

fixup-malta.c

…

fixup-mpc30x.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

fixup-pmcmsp.c

…

fixup-pnx8550.c

…

fixup-rbtx4927.c

…

fixup-rbtx4938.c

…

fixup-rc32434.c

…

fixup-sb1250.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

fixup-sni.c

…

fixup-tb0219.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

fixup-tb0226.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

fixup-tb0287.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

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

MIPS: Convert the irq functions to the new names

2011-03-29 14:48:07 +02:00

ops-bcm63xx.c

MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.

2009-09-17 20:07:52 +02:00

ops-bonito64.c

MIPS: Bonito64: Make Loongson independent from Bonito64 code.

2009-12-17 01:57:06 +00:00

ops-bridge.c

…

ops-emma2rh.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

ops-gt64xxx_pci0.c

…

ops-lantiq.c

MIPS: Lantiq: Add PCI controller support.

2011-05-19 09:55:42 +01:00

ops-loongson2.c

MIPS: Lemote 2F: Ensure atomic execution of _rdmsr and _wrmsr

2010-04-12 17:26:12 +01:00

ops-mace.c

…

ops-msc.c

…

ops-nile4.c

MIPS: NILE4: Remove useless inclusion of GT64120 header.

2011-07-20 23:12:09 +01:00

ops-pmcmsp.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

ops-pnx8550.c

…

ops-rc32434.c

…

ops-sni.c

…

ops-titan-ht.c

MIPS: PCI: RM9000 checkpatch cleanup

2010-08-05 13:25:44 +01:00

ops-titan.c

…

ops-tx3927.c

MIPS: Add missing #inclusions of <linux/irq.h>

2010-10-07 14:08:54 +01:00

ops-tx4927.c

MIPS: Add missing #inclusions of <linux/irq.h>

2010-10-07 14:08:54 +01:00

ops-vr41xx.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

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

MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.

2009-09-17 20:07:52 +02:00

pci-bcm63xx.h

MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.

2009-09-17 20:07:52 +02:00

pci-bcm1480.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

pci-bcm1480ht.c

MIPS: Remove useless zero initializations.

2009-09-17 20:07:51 +02:00

pci-emma2rh.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

pci-ip27.c

MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.

2009-06-24 18:34:39 +01:00

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

MIPS: Lantiq: Add PCI controller support.

2011-05-19 09:55:42 +01:00

pci-lasat.c

…

pci-octeon.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

pci-rc32434.c

MIPS: RC32434: Fix PCI build error

2011-09-21 17:51:57 +02:00

pci-sb1250.c

MIPS: SB1250: Include correct header and fix a warning

2010-04-30 20:52:43 +01:00

pci-tx4927.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

pci-tx4938.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

pci-tx4939.c

MIPS: Eleminate filenames from comments

2009-08-03 17:52:40 +01:00

pci-vr41xx.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

pci-vr41xx.h

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

pci-xlr.c

MIPS: XLR, XLS: Add PCI support.

2011-05-19 09:55:41 +01:00

pci-yosemite.c

MIPS: Set io_map_base for several PCI bridges lacking it

2010-07-26 19:08:19 +01:00

pci.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

pcie-octeon.c

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00