summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-09-23 11:01:25 -0700
committerMark Brown <broonie@kernel.org>2015-09-23 11:01:25 -0700
commite32efed3ead2c5035cf6b15714904396f25e8dd7 (patch)
treec60b8fd2d0f98f89663045ebb3022dcebb2f4f0e /include/sound
parent9abbe73e7d49ff7939c9a45bf50647cf47b05abf (diff)
parentbaafd373e9287f20ca0c9a6bb38eb6785a146ac2 (diff)
parent8985729578cb42f9e781a8e38e5b6b1ee90c1018 (diff)
parent462c30bc8b3457e2904c45babf4cb06c3b38ed4e (diff)
parent9d70594760a94523c550d2cc0f47b3c0af63c8e9 (diff)
Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom', 'asoc/topic/rcar' and 'asoc/topic/rockchip' into asoc-next