From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Aug 2009 17:45:09 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.31-rc7~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4dfd79e7b42bff334128907e28c3b41f1ef1cec8;p=~shefty%2Frdma-dev.git

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: 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.
---

4dfd79e7b42bff334128907e28c3b41f1ef1cec8