Mark Brown d5efccd5b6
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
2012-04-13 14:04:08 +01:00
2012-04-16 19:40:27 +01:00
2012-04-10 14:13:30 -04:00
2012-04-13 18:45:13 -07:00
2012-04-09 15:47:49 -04:00
2012-04-12 15:36:33 -07:00
2012-04-12 00:05:05 +02:00
2012-04-13 17:57:40 -07:00
2012-04-10 15:30:16 -07:00
2012-04-10 22:15:39 -06:00
2012-04-12 17:42:01 +01:00
2012-04-09 12:17:38 -07:00
2012-04-10 08:09:03 -07:00
2012-04-12 18:51:32 -07:00
2012-04-12 12:49:07 -07:00
2012-04-12 15:36:33 -07:00
2012-04-12 16:05:06 +10:00
2012-04-11 11:05:34 -07:00
2012-04-13 14:04:08 +01:00
2012-04-12 14:04:33 -07:00
2012-04-10 14:20:56 -06:00
2012-04-15 13:06:29 -07:00
2012-04-10 10:26:41 -07:00
2012-04-12 13:12:12 -07:00
2012-04-15 11:08:53 -07:00
2012-04-15 17:35:19 -07:00
2012-04-12 15:35:12 -07:00
2012-04-12 15:36:33 -07:00
2012-04-11 08:31:06 -07:00
2012-04-15 11:14:54 -07:00
d5efccd5b6