git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 516541a e816b57)
ASoC: Merge tag 'v3.4-rc3' into for-3.5
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 16 Apr 2012 18:40:27 +0000 (19:40 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 16 Apr 2012 18:40:27 +0000 (19:40 +0100)
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


Trivial merge
Pandora Kernel Repository