Merge tag 'topic/drm-misc-2015-07-28' into drm-intel-next-queued