xf86-video-apm: Changes to 'master'

[Adam Jackson]

 man/apm.man      |    4 
 src/apm.h        |    1 
 src/apm_accel.c  |  493 ++++++++++++++++---------------------------------------
 src/apm_dga.c    |   16 -
 src/apm_driver.c |  260 ++++++++---------------------
 src/apm_funcs.c  |   38 ----
 src/apm_video.c  |    9 -
 7 files changed, 232 insertions(+), 589 deletions(-)

New commits:
commit f66da557eb7773856081bda2465973dfabf3eaa0
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 19 16:09:34 2011 -0500

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

commit ca19356b3b979b92535f6f22f79c8bab852093a4
Merge: 413eee03287b6e161ce0337df712099b585aa722 967f6f20670baa33506c3c1b107260a4f909f3d6
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 19 16:06:05 2011 -0500

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-apm

commit 413eee03287b6e161ce0337df712099b585aa722
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Jun 4 17:10:07 2010 -0400

    Remove non-linear framebuffer mapping
    
    It hasn't worked since the pciaccess conversion anyway.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>