linux-sg2042/sound/soc/au1x
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
..
Kconfig Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
Makefile ASoC: Add a DB1x00 AC97 machine driver 2011-07-27 19:10:48 +01:00
ac97c.c ASoC: keep pointer to resource so it can be freed 2011-10-22 10:46:35 +01:00
db1000.c ASoC: Add a DB1x00 AC97 machine driver 2011-07-27 19:10:48 +01:00
db1200.c ASoC: au1x: update db1200 machine to the new way of things 2011-07-27 19:16:47 +01:00
dbdma2.c ASoC: au1x: use substream stream info directly 2011-07-27 19:16:51 +01:00
dma.c sound: irq: Remove IRQF_DISABLED 2011-09-22 11:19:20 +02:00
i2sc.c ASoC: keep pointer to resource so it can be freed 2011-10-22 10:46:35 +01:00
psc-ac97.c ASoC: keep pointer to resource so it can be freed 2011-10-22 10:46:35 +01:00
psc-i2s.c ASoC: keep pointer to resource so it can be freed 2011-10-22 10:46:35 +01:00
psc.h ASoC: au1x: use substream stream info directly 2011-07-27 19:16:51 +01:00