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