summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-16 19:06:18 +0000
committerMark Brown <broonie@kernel.org>2017-02-16 19:06:18 +0000
commit5835a4e1a7c4766e420478275323e7c689cff3c2 (patch)
tree6c3c34826417530de625cc5b10be01599920c6c4 /sound
parenta3582df5e76dcacd0b63f1c943a93f743e57ee56 (diff)
parent3f81d9aa80ae4b513416440e416a6486ef2ad817 (diff)
parentd6075c2601800a8a45bf6f7c3d87afa8598779b5 (diff)
parent8abab35f9a58e15b1f90a1371da69a207e40fc3b (diff)
Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs' and 'asoc/topic/doc' into asoc-next