Merge branch 'drm-next-4.2' of git://people.freedesktop.org/~agd5f/linux