Merge tag 'drm-intel-next-2012-02-16-merge-resolved' of git://people.freedesktop...