From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Aug 2011 17:34:24 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v3.1-rc5~7
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=ebde8b0223020b0cdd18c284ab5c0bb67ebc787e;p=cascardo%2Flinux.git

Merge branch 'drm-fixes' of git://git./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: add s/r quirk for Compaq Presario V5245EU
  drm/radeon/kms: evergreen & ni reset SPI block on CP resume
  drm: Fix the number of connector and encoder to cleanup functions
---

ebde8b0223020b0cdd18c284ab5c0bb67ebc787e