summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-03 10:39:53 +0100
committerMark Brown <broonie@linaro.org>2014-06-03 10:39:53 +0100
commit440a5285589d4abc7f7c44f063a3554557820ab6 (patch)
tree171918c26e759c4d8efad31d1fe30d737a104318 /include/sound
parentb12a1906be48d1d020e1e20550b93417c7c3d767 (diff)
parent87c1936426d13d4f0dba29430c792e6d3562f2be (diff)
parentad32d0c7b0e993433df152ae747652647eb65a27 (diff)
downloadlinux-440a5285589d4abc7f7c44f063a3554557820ab6.tar.bz2
Merge remote-tracking branches 'asoc/topic/omap' and 'asoc/topic/rcar' into asoc-next