Merge branch 'upstream-master' into upstream-randr-1.2 origin/randr-1.2
authorBen Skeggs <skeggsb@gmail.com>
Wed, 8 Aug 2007 02:28:20 +0000 (12:28 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 8 Aug 2007 02:28:20 +0000 (12:28 +1000)
commit096a2a556016c609ad0200ea4592ceb42a347a1d
treeecdac17a96f9dcdae0d05d241c1865bf5a14b975
parent94da101b675916aeaf751df28bea4af67b2bb175
parent9cb4c95a4fbf38fcb8249e765ff71b2e24912244
Merge branch 'upstream-master' into upstream-randr-1.2

Conflicts:

src/nv_dma.c
src/nv_dma.h
src/nv_exa.c
src/nv50_exa.c
src/nv_accel_common.c
src/nv_crtc.c
src/nv_dma.c
src/nv_dma.h
src/nv_driver.c
src/nv_exa.c
src/nv_proto.h
src/nv_type.h
src/nv_xaa.c