Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Jul 2011 14:27:45 +0000 (07:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Jul 2011 14:27:45 +0000 (07:27 -0700)
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: clean up multiple crtc handling for evergreen+ (v2)


Trivial merge