Merge branch 'nouveau-1' of git+ssh://git.freedesktop.org/git/mesa/drm into nouveau-1
authorBen Skeggs <darktama@iinet.net.au>
Mon, 13 Nov 2006 17:52:08 +0000 (04:52 +1100)
committerBen Skeggs <darktama@iinet.net.au>
Mon, 13 Nov 2006 17:52:08 +0000 (04:52 +1100)
commit35bf8fb5cf8ab4d4e055cdef26531d86dbf822dc
treeeede4e98bbb6c8c1b31df6f877ef1ea2c3adfc28
parent9ef4bbc66c1b055b4450ea9354945d784751cef7
parent1123ab089075af3141c794696ec394fa46b4353f
Merge branch 'nouveau-1' of git+ssh://git.freedesktop.org/git/mesa/drm into nouveau-1