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
..
2011-03-31 11:26:23 -03:00
2009-01-21 15:12:40 +01:00
2011-08-17 00:53:54 +09:00
2011-05-19 14:10:45 -07:00
2011-03-31 11:26:23 -03:00
2010-05-10 09:49:30 +02:00
2010-12-01 12:14:47 +01:00
2011-03-31 11:26:23 -03:00
2009-02-05 09:17:50 +01:00
2012-01-03 22:54:56 -05:00
2011-09-22 11:19:20 +02:00
2011-12-31 17:53:52 +01:00
2008-11-17 11:45:39 +00:00
2010-10-18 16:46:27 -07:00
2012-04-01 11:28:24 +01:00
2011-02-14 17:10:11 +01:00
2011-07-26 17:21:24 +02:00
2012-03-18 18:22:37 +01:00
2012-01-25 10:19:35 +01:00
2010-02-12 10:31:06 +00:00
2012-01-26 16:07:55 +00:00
2011-09-20 16:02:16 +01:00
2009-12-18 13:06:47 +00:00
2011-08-08 14:30:37 +09:00
2010-04-30 16:12:44 +01:00
2009-11-05 18:10:25 +01:00