Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarn...
authorDave Airlie <airlied@redhat.com>
Tue, 28 Feb 2012 08:20:14 +0000 (08:20 +0000)
committerDave Airlie <airlied@redhat.com>
Tue, 28 Feb 2012 08:20:14 +0000 (08:20 +0000)
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel:
  drm/i915: Remove use of the autoreported ringbuffer HEAD position
  drm/i915: Prevent a machine hang by checking crtc->active before loading lut
  drm/i915: fix operator precedence when enabling RC6p
  drm/i915: fix a sprite watermark computation to avoid divide by zero if xpos<0
  drm/i915: fix mode set on load pipe. (v2)


Trivial merge