summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-19 16:36:13 +0000
committerMark Brown <broonie@kernel.org>2017-02-19 16:36:13 +0000
commitb7707a8be6a79b7ea2103c92da5ed5a56e9ba26d (patch)
tree5e51b9da886430fd8ae1000c38f3e52c4c09d339 /include/sound
parenta2d64282dd11520d2e967b871e35b798ece05298 (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