linux-kernel-test/sound/soc
Russell King 5a89770daa Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
2008-10-07 19:08:56 +01:00
..
at32 [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
at91 removed unused #include <linux/version.h>'s 2008-08-23 12:14:12 -07:00
au1x ALSA: Au1xpsc: psc not disabled when TX is idle 2008-07-15 15:08:28 +02:00
codecs Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2008-08-25 11:24:51 -07:00
davinci [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
fsl ALSA: ASoC: fix SNDCTL_DSP_SYNC support in Freescale 8610 sound drivers 2008-08-04 12:26:23 +02:00
omap ALSA: ASoC: Fix error paths in N810 machine driver init and release clocks at exit 2008-08-26 12:44:03 +02:00
pxa Merge branches 'pxa-core' and 'pxa-machines' into pxa-all 2008-10-07 19:08:56 +01:00
s3c24xx [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
sh ALSA: asoc: sh - merge structs snd_soc_codec_dai and snd_soc_cpu_dai. 2008-07-10 09:32:46 +02:00
Kconfig ALSA: ASoC: Au12x0/Au1550 PSC Audio support 2008-07-10 09:33:07 +02:00
Makefile ALSA: ASoC: Au12x0/Au1550 PSC Audio support 2008-07-10 09:33:07 +02:00
soc-core.c ALSA: asoc: core - add Digital Audio Interface (DAI) control functions. 2008-07-10 09:32:50 +02:00
soc-dapm.c ALSA: ASoC: Export dapm_reg_event() fully 2008-07-29 16:00:33 +02:00