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