Russell King ed40d0c472 Merge branch 'origin' into devel ...

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

2009-03-28 20:29:51 +00:00

..

aaci.c

Merge branch 'topic/snd_card_new-err' into for-linus

2009-03-24 00:35:35 +01:00

aaci.h

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2007-02-19 13:18:39 -08:00

devdma.c

[ALSA] Remove sound/driver.h

2008-01-31 17:29:48 +01:00

devdma.h

[ALSA] Remove xxx_t typedefs: ARM AACI

2006-01-03 12:20:01 +01:00

Kconfig

ALSA: drop outdated and broken sa11xx-uda1341 driver

2009-03-17 17:58:13 +01:00

Makefile

ALSA: drop outdated and broken sa11xx-uda1341 driver

2009-03-17 17:58:13 +01:00

pxa2xx-ac97-lib.c

Merge branch 'origin' into devel

2009-03-28 20:29:51 +00:00

pxa2xx-ac97.c

Merge branch 'origin' into devel

2009-03-28 20:29:51 +00:00

pxa2xx-pcm-lib.c

[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h

2009-03-09 21:22:38 +08:00

pxa2xx-pcm.c

ALSA: Separate common pxa2xx-pcm code

2008-09-23 08:18:10 +02:00

pxa2xx-pcm.h

[ARM] pxa: explicit #include <mach/dma.h> in various drivers

2008-12-02 14:42:26 +08:00