]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 085ccd7 0c35245)
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)
commitfd2ee892e20b30f2c637737dc516bf98f9725b52
tree87994943963bf2f34b3f1fa982d909fd82f56746tree | snapshot
parent085ccd76296849caa5488604226535226c3bcd65commit | diff
parent0c35245a681e6df58b66b75c1aac123223ee3149commit | 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 | | blob | history
sound/soc/pxa/pxa2xx-i2s.c diff1 | diff2 | blob | history
sound/soc/soc-core.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.