From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Jul 2011 21:04:26 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v6.6-pxa1908~30053
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=c835490196c42d9f225ee6873880f436d031df86;p=linux.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/radeon/kms/evergreen: emit SQ_LDS_RESOURCE_MGMT for blits
  agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M
  drm/radeon/kms: fix typo in read_disabled vbios code
  drm/radeon/kms: use correct BUS_CNTL reg on rs600
  drm/radeon/kms: fix backend map typo on juniper
  drm/radeon/kms: fix regression in hotplug
---

c835490196c42d9f225ee6873880f436d031df86