xf86-video-s3: Changes to 'master'

[Adam Jackson]

 src/s3_driver.c |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit e5c1c27b83e93d9cb2a74c7c4ee85b36eb1bbdef
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 19 17:17:28 2011 -0500

    Fix for new vgahw ABI
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

commit 1aa3e0413bcf89734083649c2057fc4065c8348d
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 19 17:16:44 2011 -0500

    Fall back to shadowfb if XAA is unavailable
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>