Merge branch 'master' of git+ssh://marcheu@git.freedesktop.org/git/mesa/drm
authorStephane Marchesin <marchesin@icps.u-strasbg.fr>
Fri, 5 Jan 2007 19:50:46 +0000 (20:50 +0100)
committerStephane Marchesin <marchesin@icps.u-strasbg.fr>
Fri, 5 Jan 2007 19:50:46 +0000 (20:50 +0100)
1  2 
shared-core/nouveau_drv.h

Simple merge