summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-27 18:18:36 +0000
committerMark Brown <broonie@linaro.org>2014-01-27 18:18:36 +0000
commite65523ca79fd087d9888598eadeb9554e2bd2102 (patch)
tree4114bdcde27bd22058c08983e483d8ee5bbea862 /sound/soc/omap
parent34354792432b6e0a3b156819a1a19716c50d3473 (diff)
parentefe2ab9b0274b60327ca148e101177ba9708b9ba (diff)
parenta23544a6cc448e3a90630814ddb79690eb9ce444 (diff)
parent4c021cc5a49eeb423c2708374a5745b1acdc4f8b (diff)
parentbb651b3dce07e981e20384efa9cc89b93b974b49 (diff)
parent609e6025b8ed347c5eba54eb12357193e46dd34f (diff)
parent0cf0f174400d6953df8c09ed5ed92b37ec7a675b (diff)
Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl', 'asoc/fix/omap', 'asoc/fix/samsung', 'asoc/fix/simple', 'asoc/fix/tlv320aic32x4' and 'asoc/fix/wm5100' into asoc-linus