]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.7' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 8 Sep 2012 01:47:47 +0000 (09:47 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 8 Sep 2012 01:47:47 +0000 (09:47 +0800)
Conflicts:
sound/soc/omap/am3517evm.c

1  2 
sound/soc/codecs/arizona.c
sound/soc/codecs/mc13783.c
sound/soc/soc-dapm.c
sound/soc/ux500/ux500_msp_i2s.c

Simple merge
Simple merge
Simple merge
Simple merge