xf86-video-sis: Changes to 'master'

[Jeremy Huddleston]

 src/initextx.c      |   18 ++---
 src/sis.h           |    8 ++
 src/sis6326_video.c |    6 -
 src/sis_dga.c       |    6 -
 src/sis_dri.c       |   24 +++---
 src/sis_driver.c    |  184 ++++++++++++++++++++++++++--------------------------
 src/sis_memcpy.c    |   10 +-
 src/sis_opt.c       |   12 +--
 src/sis_utility.c   |   46 ++++++-------
 src/sis_vga.c       |    2 
 src/sis_video.c     |    8 +-
 11 files changed, 166 insertions(+), 158 deletions(-)

New commits:
commit 28f3a899a1e317b665cc1925ce7a4e34818cfd1f
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Oct 7 12:32:22 2011 -0700

    Use malloc/calloc/realloc/free directly
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

commit c530ebb5d4ad0663838a0132e3610d713eaaa640
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Oct 7 12:24:40 2011 -0700

    Fix build failures with recent server changes to swapl and swaps
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>