tree b20a90bc599a275c898b87aa855904e93090d863
parent 38ea6e62d3e59f7e03c6c96301d1cedaab15ce3f
parent 52fa2bbc8ec46255039e2048d616bbd0852ee292
author Linus Torvalds <torvalds@linux-foundation.org> 1279824357 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1279824357 -0700

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

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: add quirk to make HP DV5000 laptop resume
  drm/radeon/kms: fix RADEON_INFO_CRTC_FROM_ID info ioctl
  Fix ttm_page_alloc.c build breakage
  drm/radeon/kms: fix legacy LVDS dpms sequence
  drm/radeon/kms: drop taking lock around crtc lookup.