]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge remote branch 'origin/master' into drm-intel-next
authorEric Anholt <eric@anholt.net>
Mon, 2 Aug 2010 02:23:53 +0000 (19:23 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 2 Aug 2010 02:34:47 +0000 (19:34 -0700)
commit2bd34f6ca86b5a5f9b749624f73310820e7a93fd
tree9e42100423e78f400412dfa974a6a13bac94d2c0
parenta2757b6fab6dee3dbf43bdb7d7226d03747fbdb1
parent9fe6206f400646a2322096b56c59891d530e8d51
Merge remote branch 'origin/master' into drm-intel-next

This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.

Conflicts:
drivers/gpu/drm/i915/intel_dp.c
drivers/char/agp/intel-gtt.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/radeon/radeon_pm.c