Merge tag 'drm-intel-next-2013-07-12' of git://people.freedesktop.org/~danvet/drm...