Merge branch 'drm-sti-next-2014-12-11' of http://git.linaro.org/people/benjamin.gaign...