summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-24 22:07:44 +0100
committerMark Brown <broonie@kernel.org>2016-07-24 22:07:44 +0100
commit9a6a362ac09d2ec07b19c085b9cbcdf1d5a03652 (patch)
tree48b66de472df1981cf62d5224c427fa848af5011 /sound
parentcc3266b90fb4dc36bb1da0aedbe62c84c9cea052 (diff)
parent42a74e77471ea42e6ab44e5be16723ede72b9901 (diff)
parent0593d4612146dc16ff6bd23423bdd434dd7b8c7b (diff)
parent7d267ddfd560da3232f4deed3427839dd0126a4a (diff)
parent62ee4ecb6b40dbddff04c857a82584f51ee460be (diff)
Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/sti' and 'asoc/topic/sunxi' into asoc-next