Merge branch 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 09:40:56 +0000 (09:40 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 09:40:56 +0000 (09:40 +0000)

Trivial merge