Merge branch 'randr-1.2' into nv50-branch origin/nv50-branch
authorBen Skeggs <skeggsb@gmail.com>
Thu, 12 Jul 2007 01:28:58 +0000 (11:28 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Thu, 12 Jul 2007 01:28:58 +0000 (11:28 +1000)
commitc91dfdf329f946c8cc581f079359092629cf73dc
tree26f2abbee7a2ab96ab4f68d79ed168b78d0643f1
parente6a16710033d189aa5d6b2e3b4a75f2dd9d05a5d
parent4cbd3a1d9dfe6d51648de36ce7ae3d02c920374e
Merge branch 'randr-1.2' into nv50-branch

Conflicts:

src/nv_driver.c
src/nv_dma.c
src/nv_driver.c
src/nv_exa.c
src/nv_proto.h
src/nv_type.h