Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Aug 2009 19:48:41 +0000 (12:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Aug 2009 19:48:41 +0000 (12:48 -0700)
commit0257a0c0c1997aac28420e784b3ef8f3ce17f093
tree043bef9438fffdbdafe84b67211df6b67f4f0c18
parente40c9056db75e093e6d99d2c14510cb131eb482a
parent9f844e5118d1627025c8ea7cfc0ea69038ea63fd
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: Fix radeon_gem_busy_ioctl harder.