Merge remote branch 'origin/master' into origin-ng
authorBen Skeggs <skeggsb@gmail.com>
Wed, 10 Sep 2008 19:13:39 +0000 (05:13 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 10 Sep 2008 19:13:39 +0000 (05:13 +1000)
commite8494011b433c3e82afcefa969e6c872e44a45d9
treed154de4987a020e9d2dc9f0f6a5c7e440b95278d
parenta3db44a50baa02c9c48c612045eb3aaf793da303
parent54b8a7ea43ec20c798dc93d881cdffa5cb1125a0
Merge remote branch 'origin/master' into origin-ng

Conflicts:

src/nv_crtc.c
src/nv_exa.c
src/nv50_exa.c
src/nv_crtc.c
src/nv_driver.c
src/nv_exa.c
src/nv_type.h