]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.4' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 9 Apr 2012 10:55:51 +0000 (11:55 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 9 Apr 2012 10:55:51 +0000 (11:55 +0100)
1  2 
MAINTAINERS
sound/soc/imx/imx-audmux.c
sound/soc/soc-core.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge