Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers, with
the following notes: - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to insecurity. - VIA driver converted to new drmContext and drmHandle names. - Radeon driver merge conflicted in many places, and MergedFB at least could probably use some checking at this point.
Showing with 94 additions and 31 deletions