xf86-video-savage: Changes to 'master'

[Ian Romanick]

 configure.ac        |   12 ++
 src/savage_dri.c    |    8 +
 src/savage_driver.c |  222 +++++++++++++++++++++++++++++++++++++++++++++++-----
 src/savage_driver.h |   17 +++
 4 files changed, 239 insertions(+), 20 deletions(-)

New commits:
commit 1eec792391d9ce9127817107100a53382f167749
Merge: 4a87cab... ffc5ba7...
Author: Ian Romanick <idr at us.ibm.com>
Date:   Thu Aug 23 18:21:37 2007 -0700

    Merge branch 'pci-rework'

commit ffc5ba7f0b1cdefdcecf6bd47018b6a4924bfc44
Author: Ian Romanick <idr at us.ibm.com>
Date:   Wed Aug 22 12:38:14 2007 -0700

    Merge PCI-rework support and "classic" PCI interface support into one tree
    
    First pass at merging both trees.  So far, this has only been compile
    tested.  I need to dig out a savage card to put in a system for
    testing, so it may take another hour or two.

commit 68ceead721aeb75b9faed6297407a320a83499e4
Merge: da23218... bf5e2a5...
Author: Ian Romanick <idr at us.ibm.com>
Date:   Wed Aug 22 11:45:43 2007 -0700

    Merge branch 'master' into pci-rework
    
    Conflicts:
    
    	src/savage_driver.h

commit da23218b067d9b1808fc1168737c79b3349af09e
Author: Ian Romanick <idr at us.ibm.com>
Date:   Wed Aug 22 11:42:47 2007 -0700

    dos2unix

commit 36c444e80324c82f7d02d9d95372123c923336a0
Merge: f2191d4... e361a95...
Author: Ian Romanick <idr at us.ibm.com>
Date:   Mon Dec 11 13:16:53 2006 -0800

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-savage into pci-rework
    
    Conflicts:
    
    	src/savage_driver.c

commit f2191d412832312b494f313841d094f87f64a5ff
Author: Ian Romanick <idr at umwelt.(none)>
Date:   Tue Aug 8 16:49:51 2006 -0700

    Minimal change set to convert driver to the new PCI interfaces.  Enjoy.