mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity
linux-stable/sound/soc/pxa
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
..
corgi.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
e740_wm9705.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
e750_wm9705.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
e800_wm9712.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
em-x270.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
hx4700.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
imote2.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
Kconfig ASoC: Fix dependency for SND_SOC_RAUMFELD and SND_PXA2XX_SOC_HX4700 2011-12-04 23:47:16 +00:00
magician.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
Makefile ASoC: add iPAQ hx4700 machine driver 2011-05-19 14:10:59 -07:00
mioa701_wm9713.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
palm27x.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
poodle.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
pxa-ssp.c ASoC: pxa-ssp: atomically set stream active masks 2012-03-19 12:47:25 +00:00
pxa-ssp.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
pxa2xx-ac97.c ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
pxa2xx-ac97.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
pxa2xx-i2s.c Linux 3.4-rc3 2012-04-16 19:40:27 +01:00
pxa2xx-i2s.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
pxa2xx-pcm.c ASoC: Convert pxa directory to module_platform_driver 2011-11-25 13:15:16 +00:00
raumfeld.c ASoC: Remove unnecessary -codec from cs4270 driver name 2012-02-28 12:35:20 +00:00
saarb.c ASoC: Convert saarb to table based DAPM init 2012-01-02 13:08:36 +00:00
spitz.c ASoC: Change spitz_ext_control to take dapm as argument. 2012-02-17 08:09:33 -08:00
tavorevb3.c ASoC: Use dai_fmt in tavorevb3 machine driver 2012-01-02 13:08:39 +00:00
tosa.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
z2.c ASoC: Convert z2 to table based DAPM init 2012-01-02 13:08:38 +00:00
zylonite.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00