UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/sound/soc/imx
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 Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.37 2010-08-15 14:56:40 +01:00
Makefile ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
eukrea-tlv320.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
imx-pcm-dma-mx2.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
imx-pcm-fiq.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
imx-ssi.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
imx-ssi.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
phycore-ac97.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
wm1133-ev1.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00