Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 10:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
d5efccd5b6
linux/sound/soc/fsl
History
Mark Brown d5efccd5b6 Linux 3.4-rc3 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEbBAABAgAGBQJPi3XOAAoJEHm+PkMAQRiGnsUH9RjHwH4YFVyuP/DKtKa6zs74
 wqkpT15yITQ5WWMog4JaJFFg5rJCUd8QZr7AS/HSn0ijDyZX5VU7Rcs9cMudDzNR
 H/5K/AscS4fjb0HwWVqoltTWHRb9QGSwVN3+E3VCDLt9P89YJ0o3QztkkuEX5dkZ
 jc7reVXTfRnCcILEa9jleOzrn+OLM3j/jAjQ2hGunl8EDLzD4b17HHPoli4jEZ/5
 5ibpSVsPD+AqzN+glbXvYjVItl12D0IQos/JdOwfuZriCVWLxysSSwHZTbPCyvBZ
 LHH4HR5T+XLSXbjJeNkUFHLzqU+d5gVRadIoWtJCxqxFjKbOs2YtzJ5Ai0nDiw==
 =kTkC
 -----END PGP SIGNATURE-----

ASoC: Merge tag 'v3.4-rc3' into for-3.5

Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.

Conflicts:
	sound/soc/soc-core.c
	sound/soc/tegra/tegra_i2s.c
	sound/soc/tegra/tegra_spdif.c
2012-04-16 19:40:27 +01:00
..
efika-audio-fabric.c ASoC: fsl: Add .owner to struct snd_soc_card 2011-12-22 17:34:32 +00:00
eukrea-tlv320.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
fsl_dma.c ASoC: use proper defines for stream directions in pcm engines 2012-01-20 13:58:25 +00:00
fsl_dma.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
fsl_ssi.c ASoC: fsl: enable ssi clock in probe function 2012-04-01 11:28:29 +01:00
fsl_ssi.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
fsl_utils.c ASoC: fsl: remove helper fsl_asoc_get_codec_dev_name 2012-04-01 11:28:27 +01:00
fsl_utils.h ASoC: fsl: remove helper fsl_asoc_get_codec_dev_name 2012-04-01 11:28:27 +01:00
imx-audmux.c Linux 3.4-rc3 2012-04-16 19:40:27 +01:00
imx-audmux.h ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
imx-pcm-dma.c ASoC: fsl: assign dma peripheral type according to bus topology 2012-04-01 11:28:29 +01:00
imx-pcm-fiq.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
imx-pcm.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
imx-pcm.h ASoC: fsl: assign dma peripheral type according to bus topology 2012-04-01 11:28:29 +01:00
imx-sgtl5000.c ASoC: fsl: add audio routing for imx-sgtl5000 2012-04-01 11:28:31 +01:00
imx-ssi.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
imx-ssi.h ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
Kconfig ASoC: fsl: remove redundant Kconfig dependency on SND_SOC_POWERPC_DMA 2012-04-04 12:35:21 +01:00
Makefile ASoC: fsl: add imx-sgtl5000 machine driver 2012-04-01 11:28:27 +01:00
mpc5200_dma.c ASoC: fix trivial build error in mpc5200_dma.c 2012-02-27 14:56:30 +00: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 ASoC: Convert fsl directory to module_platform_driver 2011-11-28 17:23:21 +00:00
mpc5200_psc_ac97.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
mpc5200_psc_i2s.c ASoC: Convert fsl directory to module_platform_driver 2011-11-28 17:23:21 +00:00
mpc8610_hpcd.c Linux 3.4-rc2 2012-04-09 11:53:45 +01:00
mx27vis-aic32x4.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
p1022_ds.c Linux 3.4-rc2 2012-04-09 11:53:45 +01:00
pcm030-audio-fabric.c ASoC: fsl: Add .owner to struct snd_soc_card 2011-12-22 17:34:32 +00:00
phycore-ac97.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
wm1133-ev1.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00