Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Jul 2010 02:01:11 +0000 (19:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Jul 2010 02:01:11 +0000 (19:01 -0700)
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/edid: Fix the HDTV hack sync adjustment
  drm/radeon/kms: fix radeon mid power profile reporting


Trivial merge