summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-03-29 12:55:06 +0100
committerMark Brown <broonie@kernel.org>2017-03-29 12:55:06 +0100
commit367b1301ccbeae11adc4134182a055e7728aa9fe (patch)
tree041bb3bde35c888e64e02a0fb51113ba944115d3 /sound
parent0cb3a12f2a5827ff8692ff247538683b1b1f979d (diff)
parent7b4af793a7a4f8e04175eb6600ba9c8ba855ad20 (diff)
parentcd3ac9affc43b44f49d7af70d275f0bd426ba643 (diff)
parent2fe42dd0f13812d38daaf05bcb1fd996afd0e87a (diff)
parent72cedf599fcebfd6cd2550274d7855838068d28c (diff)
downloadlinux-367b1301ccbeae11adc4134182a055e7728aa9fe.tar.bz2
Merge remote-tracking branches 'asoc/fix/adsp', 'asoc/fix/atmel', 'asoc/fix/hdac-hdmi' and 'asoc/fix/mtk' into asoc-linus