Module Name: src
Committed By: riastradh
Date: Wed Jul 16 20:03:57 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_agpsupport.c drm_buffer.c
drm_bufs.c drm_context.c drm_crtc.c drm_crtc_helper.c drm_debugfs.c
drm_dp_helper.c drm_edid.c drm_fb_helper.c drm_gem.c drm_ioctl.c
drm_irq.c drm_mm.c drm_modes.c drm_pci.c drm_platform.c drm_stub.c
src/sys/external/bsd/drm2/dist/drm/i915: dvo_ch7xxx.c i915_dma.c
i915_drv.c i915_drv.h i915_gem.c i915_gem_context.c
i915_gem_execbuffer.c i915_gem_tiling.c i915_irq.c intel_bios.c
intel_crt.c intel_ddi.c intel_display.c intel_dp.c intel_drv.h
intel_hdmi.c intel_i2c.c intel_lvds.c intel_opregion.c
intel_overlay.c intel_panel.c intel_pm.c intel_ringbuffer.c
intel_ringbuffer.h intel_sdvo.c intel_tv.c intel_uncore.c
src/sys/external/bsd/drm2/dist/drm/vmwgfx: vmwgfx_kms.c
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_crtc.h
drm_crtc_helper.h drm_fb_helper.h drm_mm.h drm_modes.h
src/sys/external/bsd/drm2/dist/uapi/drm: drm.h drm_mode.h
Removed Files:
src/sys/external/bsd/drm2/dist/drm: drm_edid_modes.h drm_proc.c
src/sys/external/bsd/drm2/dist/drm/i915: intel_fb.c
src/sys/external/bsd/drm2/dist/uapi/drm: mga_drm.h
Log Message:
fix merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c \
src/sys/external/bsd/drm2/dist/drm/drm_buffer.c \
src/sys/external/bsd/drm2/dist/drm/drm_context.c \
src/sys/external/bsd/drm2/dist/drm/drm_crtc.c \
src/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c \
src/sys/external/bsd/drm2/dist/drm/drm_debugfs.c \
src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c \
src/sys/external/bsd/drm2/dist/drm/drm_edid.c \
src/sys/external/bsd/drm2/dist/drm/drm_gem.c \
src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c \
src/sys/external/bsd/drm2/dist/drm/drm_mm.c \
src/sys/external/bsd/drm2/dist/drm/drm_pci.c \
src/sys/external/bsd/drm2/dist/drm/drm_platform.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c \
src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/bsd/drm2/dist/drm/drm_edid_modes.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/drm_irq.c \
src/sys/external/bsd/drm2/dist/drm/drm_modes.c \
src/sys/external/bsd/drm2/dist/drm/drm_stub.c
cvs rdiff -u -r1.2 -r0 src/sys/external/bsd/drm2/dist/drm/drm_proc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/dvo_ch7xxx.c \
src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
cvs rdiff -u -r1.1.1.1 -r0 src/sys/external/bsd/drm2/dist/drm/i915/intel_fb.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/vmwgfx/vmwgfx_kms.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h \
src/sys/external/bsd/drm2/dist/include/drm/drm_crtc_helper.h \
src/sys/external/bsd/drm2/dist/include/drm/drm_fb_helper.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/include/drm/drm_mm.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/uapi/drm/drm.h \
src/sys/external/bsd/drm2/dist/uapi/drm/drm_mode.h
cvs rdiff -u -r1.1.1.1 -r0 src/sys/external/bsd/drm2/dist/uapi/drm/mga_drm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
