Merge branch 'v3.10-backport' of http://git.linaro.org/people/mathieu.poirier/coresig...