From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 May 2010 19:30:09 +0000 (-0700)
Subject: Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.35-rc1~249
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=31f46717997a83bdf6db0dd04810c0a329eb3148;p=net-next-2.6.git

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  agp: amd64, fix pci reference leaks
  drm/edid: Allow non-fatal checksum errors in CEA blocks
  drm/radeon/kms: suppress a build warning (unused variable)
  drm: Fixes linux-next & linux-2.6 checkstack warnings:
  nouveau: fix acpi_lid_open undefined
  drm/radeon/kms: release AGP bridge at suspend
---

31f46717997a83bdf6db0dd04810c0a329eb3148