| commit | 4dfd79e7b42bff334128907e28c3b41f1ef1cec8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 21 10:45:09 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 21 10:45:09 2009 -0700 |
| tree | a7a36cef11cba89663fd0d10f4ffb81c92c3fce6 | |
| parent | b57f92157e6517f0b3bd22e3a8ce7227e230c4f5 [diff] | |
| parent | f779b3e513478218cbaaaa0a506d7801cab6fd14 [diff] |
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.