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-11-03 13:28:14 -07:00
2011-09-21 17:52:15 +02:00
2011-04-13 16:58:19 -07:00
2011-08-08 14:29:33 -04:00
2011-09-21 17:52:15 +02:00
2011-05-19 09:55:45 +01:00
2011-05-27 20:06:53 -07:00
2011-09-21 17:52:15 +02:00
2011-06-15 20:04:02 -07:00
2011-09-21 17:52:15 +02:00
2011-09-21 17:52:15 +02:00
2011-04-26 10:22:59 +02:00
2011-11-03 13:28:14 -07:00
2011-06-09 15:01:37 +02:00
2011-10-24 23:34:25 +01:00
2011-10-24 23:34:27 +01:00
2011-09-21 17:53:12 +02:00
2011-09-21 17:52:15 +02:00
2011-05-19 09:55:40 +01:00
2011-09-21 17:52:22 +02:00
2011-07-01 11:06:35 +02:00
2011-07-26 16:49:47 -07:00
2011-10-24 23:34:23 +01:00
2011-09-21 17:52:15 +02:00
2011-10-24 23:34:25 +01:00
2011-07-25 17:26:55 +01:00
2011-06-15 14:35:34 +02:00
2011-11-03 13:28:14 -07:00
2011-11-03 13:28:14 -07:00
2011-03-31 11:26:23 -03:00
2011-10-20 15:00:18 +01:00
2011-05-10 18:15:26 +01:00
2011-06-10 14:55:36 +02:00
2011-07-25 17:26:56 +01:00
2011-09-21 17:52:15 +02:00
2011-10-20 15:00:18 +01:00
2011-03-29 14:48:07 +02:00
2011-07-20 23:12:11 +01:00
2011-09-21 17:52:15 +02:00
2011-09-15 17:32:26 -04:00
2011-09-21 17:52:15 +02:00
2010-08-05 13:25:51 +01:00
2010-10-19 18:32:39 +01:00
2011-07-20 23:12:11 +01:00
2011-11-03 13:28:14 -07:00
2011-05-25 08:39:54 -07:00
2011-10-20 15:00:20 +01:00