aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-05-29 15:03:24 +0100
committerMark Brown <broonie@kernel.org>2017-05-29 15:03:24 +0100
commit99570f11486e7f8baa886bc481e520191688c8cd (patch)
treeac1d213a86908322e3b66d2ee4bfa23f5babb8c4 /sound
parentbe29963c9e677cb1a3331d6d2d0854a34e2f8d97 (diff)
parent6d3edf866ffa7a9348cfc30d9f58270e4f8d068e (diff)
parent03ba791df98d15d07ea74075122af71e35c7611c (diff)
parent3048e76c93bccf875a49025870de08aed86c4692 (diff)
parent7ac45d1635a4cd2e99a4b11903d4a2815ca1b27b (diff)
Merge remote-tracking branches 'asoc/topic/rt5514', 'asoc/topic/rt5614', 'asoc/topic/sh' and 'asoc/topic/simple' into asoc-next