summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-11 13:54:35 +0000
committerMark Brown <broonie@kernel.org>2016-01-11 13:54:35 +0000
commitd6c513e8b6d0d18b7f47dd555d36c048e6c9ee82 (patch)
tree616e12d3ba393ffab166a892ac08c9111da0074c /sound/soc
parente72ceb2aca268af62384bd5c0fc7afdf678d49ec (diff)
parentf644eb62fe88a2414e5e5c1bd80e20c881f5d86a (diff)
parent4acfa36be618eb8ac3aa39f473e7550710216435 (diff)
Merge remote-tracking branches 'asoc/topic/da7218' and 'asoc/topic/da7219' into asoc-next