Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 May 2011 16:09:04 +0000 (09:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 May 2011 16:09:04 +0000 (09:09 -0700)
commitfd98a5d78062289552fff19afb9aa6918eaee63f
tree7c27dbb0c531b99609c1b0c86145397e6b47231c
parent7f4238a0ef8858e1f9b02a874b5818f6e9846673
parent4f87af46107499415afd238be104587b5a9d7ac3
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/radeon/kms: add pci id to acer travelmate quirk for 5730
  drm/radeon: fix order of doing things in radeon_crtc_cursor_set
  drm: mm: fix debug output
  drm/radeon/kms: ATPX switcheroo fixes
  drm/nouveau: Fix a crash at card takedown for NV40 and older cards