Merge branch 'drm-next-3.15-wip' of git://people.freedesktop.org/~deathsimple/linux...