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)
commitd99c7c27e2df1a7093f3d2f5c7d196f58bfe1647
tree37a2028b05c8f02ea07d29ee48c4233fbd73a614
parent025f281bbfe81960e8c60234f5eafd37cbe2d881
parent0f95ddc42892abdbc1f111b6b105f2ef4ed2b05f
Merge branch 'master' of git+ssh://marcheu@git.freedesktop.org/git/mesa/drm
shared-core/nouveau_drv.h