git.maquefel.me Git - linux.git/commit

author	Eric Anholt <eric@anholt.net>
	Mon, 2 Aug 2010 02:23:53 +0000 (19:23 -0700)
committer	Eric Anholt <eric@anholt.net>
	Mon, 2 Aug 2010 02:34:47 +0000 (19:34 -0700)
commit	2bd34f6ca86b5a5f9b749624f73310820e7a93fd
tree	9e42100423e78f400412dfa974a6a13bac94d2c0	tree \| snapshot
parent	a2757b6fab6dee3dbf43bdb7d7226d03747fbdb1	commit \| diff
parent	9fe6206f400646a2322096b56c59891d530e8d51	commit \| diff

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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/char/agp/intel-gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_edid.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_pm.c	diff1 \|	diff2 \|	blob \| history