diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-21 10:45:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-21 10:45:09 -0700 |
commit | 4dfd79e7b42bff334128907e28c3b41f1ef1cec8 (patch) | |
tree | a7a36cef11cba89663fd0d10f4ffb81c92c3fce6 /drivers/cdrom | |
parent | b57f92157e6517f0b3bd22e3a8ce7227e230c4f5 (diff) | |
parent | f779b3e513478218cbaaaa0a506d7801cab6fd14 (diff) | |
download | kernel-crypto-4dfd79e7b42bff334128907e28c3b41f1ef1cec8.tar.gz kernel-crypto-4dfd79e7b42bff334128907e28c3b41f1ef1cec8.tar.xz kernel-crypto-4dfd79e7b42bff334128907e28c3b41f1ef1cec8.zip |
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.
Diffstat (limited to 'drivers/cdrom')
0 files changed, 0 insertions, 0 deletions