summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-12-23 00:23:37 +0000
committerMark Brown <broonie@kernel.org>2015-12-23 00:23:37 +0000
commit38cfbc12c84890ad790c36f9a8ca9527a3b99409 (patch)
tree78ed22116823a3d3c1e3acd5c51491af6c43ae6c /include/sound
parent8ebdab65feea540984495a1a22f3d14d9b99af76 (diff)
parent0f611e2551deeedaafc0f01b8607eb580622b7bb (diff)
parent3f317c9faabc546a503bc62e806fa2e8e93e76be (diff)
parente05c25a1af29d65260ed1458f2cc4a959030ebd2 (diff)
downloadop-kernel-dev-38cfbc12c84890ad790c36f9a8ca9527a3b99409.zip
op-kernel-dev-38cfbc12c84890ad790c36f9a8ca9527a3b99409.tar.gz
Merge remote-tracking branches 'asoc/topic/atmel-classd', 'asoc/topic/const' and 'asoc/topic/da7218' into asoc-next
OpenPOWER on IntegriCloud