Merge branch 'randr-1.2' into nv50-branch
authorBen Skeggs <skeggsb@gmail.com>
Thu, 5 Jul 2007 00:34:04 +0000 (10:34 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Thu, 5 Jul 2007 00:34:04 +0000 (10:34 +1000)
commit562b0dfe045d2926ecbfea66b66d397eb2c12e03
treea0a2e8a2a5ad4ac46260bc3ee4f2fc79df4fa1f6
parent268e37684fdcb4049835d0410a9fe031aa6b6a63
parentc40713c96b9372017ac0bdc9b0d4b7f122257b2e
Merge branch 'randr-1.2' into nv50-branch
src/nv_dma.c
src/nv_type.h