Merge tag 'drm-intel-next-2012-06-04' of git://people.freedesktop.org/~danvet/drm...