tree a7a36cef11cba89663fd0d10f4ffb81c92c3fce6
parent b57f92157e6517f0b3bd22e3a8ce7227e230c4f5
parent f779b3e513478218cbaaaa0a506d7801cab6fd14
author Linus Torvalds <torvalds@linux-foundation.org> 1250876709 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1250876709 -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: 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.