Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Jun 2011 04:15:11 +0000 (21:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Jun 2011 04:15:11 +0000 (21:15 -0700)
commita6c0a392622702fc9f47ddcea5684414d44a5d3b
tree4ee1e7bca6f20c36311984b5a77db9f5470d36f2
parent2f48802e4330bb4d65d530ed9be78e8e55374577
parent498e720b96379d8ee9c294950a01534a73defcf3
Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/i915: Fix gen6 (SNB) missed BLT ring interrupts.