]> 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, 30 Apr 2012 22:44:25 +0000 (23:44 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 30 Apr 2012 22:44:25 +0000 (23:44 +0100)
commitdce0a83fbf15a65804c8ef5a91c0e8ae089d12da
tree2291288ba6edb6623c8d8ff7c708b798509a2864
parent30facd4d51d630b6cba386badd7f42456962089b
parent3a96c77ef792478f5e372b71403698606973c479
Merge branch 'for-3.5' into asoc-next

Conflicts:
sound/soc/blackfin/bf5xx-ssm2602.c
sound/soc/blackfin/bf5xx-ssm2602.c
sound/soc/codecs/cs42l73.c
sound/soc/codecs/tlv320aic23.c
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm_hubs.c
sound/soc/soc-core.c
sound/soc/soc-dapm.c