Merge remote branch 'origin/master' into ng
authorBen Skeggs <skeggsb@gmail.com>
Wed, 1 Oct 2008 15:03:32 +0000 (01:03 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 1 Oct 2008 15:03:32 +0000 (01:03 +1000)
commitdad74519751bbda2be709e6ef3758483a8d46af3
tree08e220b61e2be8802e9ae8c78b5fc40b5c96847f
parentbf3df3ed644662bb7de79c744653230b94dfd6ca
parent30eaa0f08250f72b0171a858f2694ca8a62c3ebd
Merge remote branch 'origin/master' into ng

Conflicts:
src/nv_exa.c
src/nv50_accel.c
src/nv_const.h
src/nv_crtc.c
src/nv_driver.c
src/nv_type.h