summaryrefslogtreecommitdiff
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 19:49:11 +0100
committerMark Brown <broonie@kernel.org>2015-04-12 19:49:11 +0100
commit1fa1e0731db9e5579afa60b6299b6c47447eee3a (patch)
treec3ef33df7a91f2929137276a7022e1a752661f5e /sound/soc/omap
parente1f059937a2b90a1dbf314959776d3f51b4ab20d (diff)
parent59c41d15e63063545b1f91f7ad5411c25f6d046d (diff)
parent6a328885896ef087a28173792ea93f4dde9782ef (diff)
parent8616774968f3baf0c49fc6bcca9550cac49034ee (diff)
parentd53d59ecad74f3e90c6eefedd2186abbadd64d7c (diff)
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/qcom', 'asoc/topic/rcar' and 'asoc/topic/rt286' into asoc-next