summaryrefslogtreecommitdiff
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 19:48:22 +0100
committerMark Brown <broonie@kernel.org>2015-04-12 19:48:22 +0100
commit250acc709ee23856eba8432f979e42ba64a9a8b6 (patch)
treeb96979879c1b368d077690af5ee2882eb97e7073 /sound/soc/sh
parenta37a9407ca3cec1f9218657eaec43814db1673f6 (diff)
parentc01673e0b7236140eb5bbe1c7b30aa262f142d7e (diff)
parent3a82002c7cbb166b891de515b5463aec41035c75 (diff)
parent74ff960222d90999508b4ba0d3449f796695b6d5 (diff)
parenta57069e33fbc6625f39e1b09c88ea44629a35206 (diff)
parent2f78dd7f40264697afed4c2ac0890df8f0588e49 (diff)
Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/atmel', 'asoc/fix/cs4271', 'asoc/fix/davinci' and 'asoc/fix/rcar' into asoc-linus