xf86-video-mga: Changes to 'master'

[Tilman Sauerbeck]

 src/mga_merge.c |   27 ++++++++++++++++-----------
 src/mga_reg.h   |    2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 6df85941ce077e1eee8b43945c51ab1b0906c758
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Sun Nov 26 15:39:54 2006 +0100

    Use register names in MGASaveScreenMerged() rather than magic numbers.

commit b3ee69f6ac058e52d5175f611090baa76eed49f9
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Sun Nov 26 15:24:46 2006 +0100

    Register name tweak.
    
    The "DAC power down" register powers down the DAC when it's
    set to zero, and enables it when it's set to one.
    To avoid confusion, I renamed it.