summaryrefslogtreecommitdiff
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-01 18:05:34 +0200
committerMark Brown <broonie@kernel.org>2016-07-01 18:05:34 +0200
commit7c5eec4edf4693aa61f3ee78bf28621dfe33d9f0 (patch)
tree611b1acc8cbcb29deff8c03966496507f3714379 /sound/soc/sh
parentaf5fb67877a52561c614e5fda6d163acef4c4c69 (diff)
parent4f3532506a339d91e593da59eea4e7143e698ca3 (diff)
parent572f1f613a109e03b52e72b62df2d2c0e595d3bd (diff)
parent50c7a0ef2d97e56c7ce2f1ea5fe1d8e25aadc1bb (diff)
Merge remote-tracking branches 'asoc/fix/rcar', 'asoc/fix/rt5670' and 'asoc/fix/wm8940' into asoc-linus