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