Merge branches 'topic/sta350', 'topic/core', 'topic/dapm' and 'topic/cache' of git...
authorMark Brown <broonie@linaro.org>
Tue, 22 Apr 2014 12:22:52 +0000 (13:22 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 22 Apr 2014 12:22:52 +0000 (13:22 +0100)

Trivial merge