Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Jul 2010 18:43:28 +0000 (11:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Jul 2010 18:43:28 +0000 (11:43 -0700)
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: correctly update connector DPMS status in drm_fb_helper
  drm/radeon/kms: fix shared ddc handling
  drm/ttm: Allocate the page pool manager in the heap.


Trivial merge