From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Feb 2009 00:26:09 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.29-rc6~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8310509252c51e2a0e9effb50fefe7e098a67868;p=~emulex%2Finfiniband.git

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/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: Add missing mutex_lock(&dev->struct_mutex)
  drm/i915: fix WC mapping in non-GEM i915 code.
  drm/i915: Fix regression in 95ca9d
  drm/i915: Retire requests from i915_gem_busy_ioctl.
  drm/i915: suspend/resume GEM when KMS is active
  drm/i915: Don't let a device flush to prepare buffers clear new write_domains.
  drm/i915: Cut two args to set_to_gpu_domain that confused this tricky path.
---

8310509252c51e2a0e9effb50fefe7e098a67868