Eric Anholt 2bd34f6ca8 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		2010-08-01 19:34:47 -07:00
..
drm	Merge remote branch 'origin/master' into drm-intel-next	2010-08-01 19:34:47 -07:00
vga	vgaarb: use MIT license	2010-06-03 13:13:34 +10:00
Makefile