]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit1c5ccd2d1785e6cf75e79a8fefebb8f2415554ef
tree8d4a16d2ed6b88060ed71bd4c2350ca9c29b32b9
parenta32826e4aefa905b392d2d862d51365d50d4829b
parent822b4b8d63e09076a4487eb881d3b7a13b28121c
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