CVS commit: xsrc/external/mit/xf86-video-intel/dist/src

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    xsrc
Committed By:   christos
Date:           Wed Nov  5 17:58:59 UTC 2014

Modified Files:
        xsrc/external/mit/xf86-video-intel/dist/src: backlight.c
        xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810: i810_dri.c
        xsrc/external/mit/xf86-video-intel/dist/src/sna: kgem.c
        xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel.h
Removed Files:
        xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_dri.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
    xsrc/external/mit/xf86-video-intel/dist/src/backlight.c
cvs rdiff -u -r1.2 -r1.3 \
    xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810_dri.c
cvs rdiff -u -r1.2 -r1.3 \
    xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.3 -r0 \
    xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_dri.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
    xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.