summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-03 10:39:44 +0100
committerMark Brown <broonie@linaro.org>2014-06-03 10:39:44 +0100
commitdd7a7bb50cb5b5166a562a883f149ee4721c9c63 (patch)
tree3df8d4ceb7487820621dccf194d4c6cc6ae46d66 /include
parentb8139d0afd51b8f357a018aab68ff9c4095217be (diff)
parentcb07ef36fe2d4f633b69d8c2c7629366509da488 (diff)
parent62c35b3bd2c782eac7b89c34b0c2175dc9643dd8 (diff)
Merge remote-tracking branches 'asoc/topic/adau' and 'asoc/topic/adsp' into asoc-next