Keith Packard 86a3073e48 Merge branch 'edp-training-fixes' into drm-intel-next ...

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

Just whitespace change conflicts

2011-10-20 14:10:07 -07:00

..

drm

Merge branch 'edp-training-fixes' into drm-intel-next

2011-10-20 14:10:07 -07:00

stub

i915: select VIDEO_OUTPUT_CONTROL for ACPI_VIDEO

2011-04-13 09:10:25 +10:00

vga

drivers: use kzalloc/kcalloc instead of 'kmalloc+memset', where possible

2011-07-25 20:57:13 -07:00

Makefile

…