CVS Update: xc (branch: trunk)

[Alex Deucher]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	agd5f at gabe.	04/09/16 15:00:49

Log message:
  Merge savage DDX from DRI to xorg and fix conflicts.

Modified files:
      ./:
        ChangeLog 
      xc/programs/Xserver/hw/xfree86/drivers/savage/:
        Imakefile savage.man savage_accel.c savage_bci.h 
        savage_cursor.c savage_dri.c savage_driver.c 
        savage_driver.h savage_i2c.c savage_regs.h 
        savage_streams.c savage_streams.h savage_video.c 
  
  Revision      Changes    Path
  1.371         +34 -1     xc/ChangeLog
  1.3           +39 -6     xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile
  1.3           +45 -12    xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man
  1.5           +974 -26   xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c
  1.4           +37 -1     xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h
  1.4           +8 -3      xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c
  1.3           +1 -0      xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c
  1.7           +665 -168  xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
  1.4           +186 -3    xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h
  1.2           +5 -3      xc/programs/Xserver/hw/xfree86/drivers/savage/savage_i2c.c
  1.4           +181 -25   xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h
  1.2           +116 -21   xc/programs/Xserver/hw/xfree86/drivers/savage/savage_streams.c
  1.2           +30 -2     xc/programs/Xserver/hw/xfree86/drivers/savage/savage_streams.h
  1.4           +164 -18   xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c