tree 35bc17fd4235e32fb1ab2c37ca8156ea778329bd
parent 22a8cdd60339d931d0dca54427712b2714e5ba8b
parent 75dfca80a610e4e87d3b9ccfb3f520692808697d
author Linus Torvalds <torvalds@linux-foundation.org> 1265995930 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1265995930 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: hold ref on flip object until it completes
  drm/i915: Fix crash while aborting hibernation
  drm/i915: Correctly return -ENOMEM on allocation failure in cmdbuf ioctls.
  drm/i915: fix pipe source image setting in flip command
  drm/i915: fix flip done interrupt on Ironlake
  drm/i915: untangle page flip completion
  drm/i915: handle FBC and self-refresh better
  drm/i915: Increase fb alignment to 64k
  drm/i915: Update write_domains on active list after flush.
  drm/i915: Rework DPLL calculation parameters for Ironlake