p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/sound/soc/fsl
History
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
 		2010-08-16 18:42:58 +01:00
..
Kconfig ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
Makefile ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
efika-audio-fabric.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
fsl_dma.c asoc/multi-component: fsl: fix exit and error paths in DMA and SSI drivers 2010-08-12 14:00:17 +01:00
fsl_dma.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
fsl_ssi.c asoc/multi-component: fsl: add support for disabled SSI nodes 2010-08-12 14:00:17 +01:00
fsl_ssi.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
mpc5200_dma.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
mpc5200_dma.h Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
mpc5200_psc_ac97.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
mpc5200_psc_ac97.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
mpc5200_psc_i2s.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
mpc8610_hpcd.c powerpc: rename immap_86xx.h to fsl_guts.h, and add 85xx support 2010-08-12 14:00:15 +01:00
pcm030-audio-fabric.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00