Merge tag 'drm-intel-fixes-2014-02-11' of ssh://git.freedesktop.org/git/drm-intel...
authorDave Airlie <airlied@redhat.com>
Tue, 11 Feb 2014 23:51:16 +0000 (09:51 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 11 Feb 2014 23:51:16 +0000 (09:51 +1000)
3 regression fixes in i915

* tag 'drm-intel-fixes-2014-02-11' of ssh://git.freedesktop.org/git/drm-intel:
  drm/i915: Pair va_copy with va_end in i915_error_vprintf
  drm/i915: Fix intel_pipe_to_cpu_transcoder for UMS
  drm/i915: Disable dp aux irq on g4x

1  2 
drivers/gpu/drm/i915/i915_drv.h

Simple merge