summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-04-25 16:25:07 +0100
committerMark Brown <broonie@kernel.org>2017-04-25 16:25:07 +0100
commitdc9617cb81c4130858b6dd026039f42a39e93c18 (patch)
tree533411a51837673616da0cf5212fa18c7de3e3a3 /sound
parent6e4cac23c5a648d50b107d1b53e9c4e1120c7943 (diff)
parentb6e38b2944f1153199becefb14ae3ee01778863e (diff)
parentd05d862ead8eca5e7d4ccf82d39d9189579ee5b1 (diff)
downloadlinux-dc9617cb81c4130858b6dd026039f42a39e93c18.tar.bz2
Merge remote-tracking branches 'asoc/fix/intel', 'asoc/fix/topology' and 'asoc/fix/sti' into asoc-linus