Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Aug 2009 17:45:09 +0000 (10:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Aug 2009 17:45:09 +0000 (10:45 -0700)
commit4dfd79e7b42bff334128907e28c3b41f1ef1cec8
treea7a36cef11cba89663fd0d10f4ffb81c92c3fce6
parentb57f92157e6517f0b3bd22e3a8ce7227e230c4f5
parentf779b3e513478218cbaaaa0a506d7801cab6fd14
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: add GET_PARAM/INFO support for Z pipes
  drm/radeon/kms: add r100/r200 OQ support.
  drm: Fix sysfs device confusion.
  drm/radeon/kms: implement the bo busy ioctl properly.