Chris Wilson 8a327f23e2 Merge remote branch 'linus/master' into drm-intel-fixes ...

Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().

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

2011-01-24 18:27:32 +00:00

..

Kconfig

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

Makefile

vga_switcheroo: initial implementation (v15)

2010-03-01 16:20:37 +10:00

vga_switcheroo.c

vga_switcheroo: comparing too few characters in strncmp()

2011-01-07 15:29:37 +10:00

vgaarb.c

drm/i915: Recognise non-VGA display devices

2011-01-23 12:52:16 +00:00