]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.5' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 9 Apr 2012 10:56:23 +0000 (11:56 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 9 Apr 2012 10:56:23 +0000 (11:56 +0100)
commit34fa4ded772b69a29f8c7c9ceb5dde41593b57ad
tree5a149da006ef21288ec836045d4aaa264a41397c
parent84148ba6c40c96e616f1d22f68245486e2def286
parent1eecb8280b038019f2f914abc01b28caf5d0a168
Merge branch 'for-3.5' into asoc-next

Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra20_i2s.c
MAINTAINERS
sound/soc/codecs/sgtl5000.c
sound/soc/fsl/imx-audmux.c
sound/soc/pxa/pxa2xx-i2s.c
sound/soc/soc-core.c
sound/soc/tegra/tegra20_i2s.c
sound/soc/tegra/tegra20_spdif.c