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