]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'edp-training-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Thu, 20 Oct 2011 20:40:33 +0000 (13:40 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 20 Oct 2011 21:10:07 +0000 (14:10 -0700)
commitb6dcdb5c10885e9438052808b8e9b7705393612a
tree5804f9d944084ff5245d07e8340779a4ecd52f9b
parent84865438b6d2f22feb9366a0314ef74e626b2952
parentc65352959d70a17662341ba0e2d23ed221e41e36
Merge branch 'edp-training-fixes' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/intel_dp.c

Just whitespace change conflicts
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_bios.h
drivers/gpu/drm/i915/intel_dp.c