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
..
2011-03-31 11:26:23 -03:00
2011-09-27 18:08:04 +02:00
2011-03-31 11:26:23 -03:00
2011-05-19 09:55:41 +01:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2009-07-03 15:45:26 +01:00
2008-12-12 18:12:23 +00:00
2010-02-27 12:53:42 +01:00
2010-08-05 13:26:29 +01:00
2009-12-05 09:10:12 -08:00
2011-05-10 18:15:24 +01:00
2010-02-27 12:53:27 +01:00
2009-07-03 15:45:29 +01:00
2011-07-25 17:26:53 +01:00
2009-12-17 01:57:32 +00:00
2010-10-26 16:52:08 -07:00
2011-07-26 16:49:47 -07:00
2009-06-17 11:06:28 +01:00
2011-03-31 11:26:23 -03:00
2010-08-05 13:26:29 +01:00
2010-08-05 13:26:29 +01:00
2010-06-09 11:12:36 +02:00
2011-07-26 16:49:47 -07:00
2011-01-13 17:32:47 -08:00
2010-04-12 17:26:14 +01:00
2010-02-27 12:53:14 +01:00
2010-02-27 12:53:14 +01:00
2011-03-31 11:26:23 -03:00
2010-10-04 18:33:55 +01:00
2010-02-27 12:53:27 +01:00
2010-10-26 16:52:08 -07:00
2011-07-25 17:26:51 +01:00
2011-03-31 11:26:23 -03:00
2009-07-03 15:45:27 +01:00
2010-02-27 12:53:27 +01:00
2009-11-02 12:00:01 +01:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2011-07-20 23:12:10 +01:00
2010-02-27 12:53:14 +01:00
2010-02-27 12:53:42 +01:00
2010-08-09 16:48:44 -04:00
2011-03-23 19:47:18 -07:00
2011-07-26 06:47:36 +01:00
2010-02-27 12:53:27 +01:00
2010-04-12 17:26:14 +01:00
2011-03-31 11:26:23 -03:00