Merge branch 'v3.10-backport' of git://git.linaro.org/people/mathieu.poirier/coresigh...
authorMark Brown <broonie@kernel.org>
Fri, 9 Jan 2015 18:09:53 +0000 (18:09 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 9 Jan 2015 18:09:53 +0000 (18:09 +0000)

Trivial merge