tree f46a109ecc3b266ff4e7d61ddbf1896fa4202597
parent 09c50b4a52c01a1f450b8eec819089e228655bfb
parent 5004417d840e6dcb0052061fd04569b9c9f037a8
author Linus Torvalds <torvalds@linux-foundation.org> 1235348769 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235348769 -0800

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.