]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.7' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 11 Sep 2012 03:27:08 +0000 (11:27 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 11 Sep 2012 03:27:08 +0000 (11:27 +0800)
commite0ca462625cb8ea5c6ae927702cb3821f910f68e
tree04cf88a59886b06ac66149e2c7095fb01ac2c300
parenta32826e4aefa905b392d2d862d51365d50d4829b
parent7e94ca4752991c3830515f6e17ee5a7334a7f590
Merge branch 'for-3.7' into asoc-next

Conflicts:
sound/soc/omap/am3517evm.c
sound/soc/codecs/arizona.c
sound/soc/codecs/mc13783.c
sound/soc/soc-dapm.c
sound/soc/ux500/ux500_msp_i2s.c