summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-02-07 11:25:47 +0000
committerMark Brown <broonie@kernel.org>2018-02-07 11:25:47 +0000
commit3d0a352a552e6cdf052e8baf66f1fe6418c122fe (patch)
tree83a04e103585e26e35e25cfd3fb2ba1aed978979 /sound
parent171248777a402f1d95b9f5d5928fe86514182224 (diff)
parent2efb8a8f11ba92971551189da91ece8b5040e461 (diff)
parentda689e0da3c042c9d240e21189a2af0aa9da3ab5 (diff)
parenteda85d1fee05d69e97939f9603b857f2244d72d9 (diff)
downloadlinux-3d0a352a552e6cdf052e8baf66f1fe6418c122fe.tar.bz2
Merge remote-tracking branches 'asoc/topic/sam9x5_wm8731', 'asoc/topic/sgtl5000' and 'asoc/topic/sun8i-codec' into asoc-next