Daniel Vetter a22ddff8be Merge tag 'v3.6-rc2' into drm-intel-next ...

Backmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put
even more madness on top:

- drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in
  -fixes, that has been changed in a variable-rename in -next, too.

- drivers/gpu/drm/i915/intel_ringbuffer.c: -next remove scratch_addr
  (since all their users have been extracted in another fucntion),
  -fixes added another user for a hw workaroudn.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

2012-08-17 09:01:08 +02:00

..

drm

Merge tag 'v3.6-rc2' into drm-intel-next

2012-08-17 09:01:08 +02:00

stub

i915: select VIDEO_OUTPUT_CONTROL for ACPI_VIDEO

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

vga

vga_switcheroo: Enable/disable audio clients at the right time

2012-06-09 12:14:43 +02:00

Makefile

gpu: Add Intel GMA500(Poulsbo) Stub Driver

2010-10-26 11:00:13 +10:00