From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Mar 2009 00:11:36 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.29-rc7~8
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=43e407071d97c1a07a4601896581554a6b3bfd67;p=safe%2Fjmp%2Flinux-2.6

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.
---

43e407071d97c1a07a4601896581554a6b3bfd67