kernel-fxtec-pro1x/arch/mips/alchemy/devboards
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
..
db1x00 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
db1200 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
pb1000 MIPS: Alchemy: Clean up GPIO registers and accessors 2011-05-19 09:55:46 +01:00
pb1100 MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines 2011-10-24 23:34:24 +01:00
pb1200 MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines 2011-10-24 23:34:24 +01:00
pb1500 MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines 2011-10-24 23:34:24 +01:00
pb1550 MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines 2011-10-24 23:34:24 +01:00
bcsr.c MIPS: Alchemy: DB1200: Disable cascade IRQ in handler 2011-09-21 17:53:32 +02:00
Makefile MIPS: Move Alchemy Makefile parts to their own Platform file. 2010-08-05 13:25:46 +01:00
platform.c MIPS: Alchemy: use 36bit addresses for PCMCIA resources. 2010-02-27 12:53:43 +01:00
platform.h MIPS: Alchemy: use 36bit addresses for PCMCIA resources. 2010-02-27 12:53:43 +01:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
prom.c MIPS: Alchemy: Rewrite UART setup and constants. 2011-05-19 09:55:45 +01:00