From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Jul 2011 16:08:56 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~17149
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6e139047e2eecd0ccf8bc2f1564e82747cb6e56c;p=mirror_ubuntu-artful-kernel.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:
  Revert "drm/nvc0: recognise 0xdX chipsets as NV_C0"
  drm/radeon/kms: fix typo in cayman reg offset
  drm/radeon/kms: use correct reg on fusion when reading back mem config
---

6e139047e2eecd0ccf8bc2f1564e82747cb6e56c