Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Aug 2011 17:34:24 +0000 (10:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Aug 2011 17:34:24 +0000 (10:34 -0700)
commitebde8b0223020b0cdd18c284ab5c0bb67ebc787e
treedc8e51ccfae92f3e7c709e59f831ff22b7531789
parentbd823821e68e5de6d680cbbf1c8654c9c36674e1
parent302a8e8b06d312dcb3b718dfeb42aa912b5f426b
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