Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Mar 2009 00:11:36 +0000 (16:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Mar 2009 00:11:36 +0000 (16:11 -0800)
commit43e407071d97c1a07a4601896581554a6b3bfd67
tree6f5bbf72bda0c983373a315d62dc229e591fca89
parent155b25bcc28631a5b5230191aa3f56c40dfffa3f
parent299eb93c5f651b2bc368ada67d8471e4c575fa21
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 use-before-null-check in i915_irq_emit().
  drm: Avoid client deadlocks when the master disappears.
  drm: Wake up all lock waiters when the master disappears.
  drm: Don't return ERESTARTSYS to user-space.