summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-18 11:56:05 +0000
committerMark Brown <broonie@kernel.org>2018-01-18 11:56:05 +0000
commit7cc289b9c689fcb2ba695317319e61720dcd73ba (patch)
tree5913e49361fcb004e5c570a1bcf62c23fa51659f /sound
parentfab9298cb6ec24e78c202e727a3cc728f229836c (diff)
parent949293d45d6b0951e2dfdfd670a9c0092b10fd27 (diff)
parentd04c413f2ab3aa5998bf86f7a2f6235ed82b2ee2 (diff)
parentfe83b1b7d7d0ff11210f84f25b8e1ba1afbac76f (diff)
parent080f773d226a9c2b0fa0d8f02107518c560f8b77 (diff)
parentfa25b4f59f1de9536104b632ec4c4c0b8f8e54ec (diff)
Merge remote-tracking branches 'asoc/topic/mxs', 'asoc/topic/mxs-sgtl5000', 'asoc/topic/nau8540', 'asoc/topic/nau8824' and 'asoc/topic/nau8825' into asoc-next