Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Thu, 15 Nov 2007 09:42:47 +0000 (10:42 +0100)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Thu, 15 Nov 2007 09:42:47 +0000 (10:42 +0100)
commitd1b0258b32ad2af99f3aff4f0aedea676d0ff421
tree7ad39b748396e0ccbf12043c0a8f879b4f9e6503
parentca499f4d14ae29159f13957f2adc0536c71bf6d4
parent6206091e5f300616c27dc834922f2976d97f72d4
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
linux-core/drm_bo.c
linux-core/drm_objects.h