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)
commit1cf66e16160653b4ac92e3ada57fc0bc48798145
treead6b4bac80f4caf9edc1cddb12f273af99615b1e
parentde51257aa301652876ab6e8f13ea4eadbe4a3846
parenta4967de6cbb260ad0f6612a1d2035e119ef1578f
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/edid: Fix the HDTV hack sync adjustment
  drm/radeon/kms: fix radeon mid power profile reporting