From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 May 2011 15:47:31 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.39~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239;p=~shefty%2Frdma-dev.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: Take lock around probes for drm_fb_helper_hotplug_event
  drm/i915: Revert i915.semaphore=1 default from 47ae63e0
  vga_switcheroo: don't toggle-switch devices
  drm/radeon/kms: add some evergreen/ni safe regs
  drm/radeon/kms: fix extended lvds info parsing
  drm/radeon/kms: fix tiling reg on fusion
---

7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239