summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-16 19:06:14 +0000
committerMark Brown <broonie@kernel.org>2017-02-16 19:06:14 +0000
commita3582df5e76dcacd0b63f1c943a93f743e57ee56 (patch)
treed6f4bcdf0022af5ba6f73558618a5c1bb8c00dde /sound
parent4bfd52361e17d9efd27ca06464ceaa2c43dcb2d5 (diff)
parentca8c7f233fa2c40e2a23f982dc33d947f28ad207 (diff)
parent8480ac567959eecdc694cf4f9c02d6fa687384b6 (diff)
parent31489c0b1d8b33e5b696ba18feb880617e937554 (diff)
parentac29a8f41740186aee601de99c729530e37ca77c (diff)
Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/chmap', 'asoc/topic/cq93vc' and 'asoc/topic/da7218' into asoc-next