974a6a13bac94d2c0
parent a2757b6fab6dee3dbf43bdb7d7226d03747fbdb1
parent 9fe6206f400646a2322096b56c59891d530e8d51
author Eric Anholt <eric@anholt.net> 1280715833 -0700
committer Eric Anholt <eric@anholt.net> 1280716487 -0700

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
���