summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:53:39 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:53:39 +0100
commit7c0031360bd721254a52c56bd1c2e90b6d9df57b (patch)
tree39af36511fa5043ce97096f5d4556cac786042bd /include/sound
parent399962239c07ab00adbfda72064b045c9c2c7b40 (diff)
parent508a43fdd73072c959f849b4e9eb60a9b523396f (diff)
parent553de19a0e2f21809bc3864d40308864652521eb (diff)
parent628536ea0627e71da654bd34b1942c85832dbdba (diff)
parentc5b8540dca22526517f4d96857678466613467d1 (diff)
Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/davinci-vcif', 'asoc/topic/doc' and 'asoc/topic/dpcm' into asoc-next