]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd5efccd5b6843c504042735c1e20d9252daefd98
tree87994943963bf2f34b3f1fa982d909fd82f56746tree | snapshot
parent516541a00c6a6bced133158f0146b602a18dcbe5commit | diff
parente816b57a337ea3b755de72bec38c10c864f23015commit | diff
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
MAINTAINERS diff1 | diff2 | blob | history
sound/soc/codecs/sgtl5000.c diff1 | diff2 | blob | history
sound/soc/fsl/imx-audmux.c diff1 | diff2 | blob | history
sound/soc/pxa/pxa2xx-i2s.c diff1 | diff2 | blob | history
sound/soc/soc-core.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules