Merge remote-tracking branches 'asoc/topic/headers', 'asoc/topic/intel', 'asoc/topic...
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:54 +0000 (00:23 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:54 +0000 (00:23 +0100)

Trivial merge