tree 7fd52ec62d07869f033c0a731742718a4a61f684
parent 379dd277edd0e19edf91710849b520629c3be4b2
parent 1d2cb9a54abc6e1d239f28f07661366d5662a94a
author Dave Airlie <airlied@redhat.com> 1392162676 +1000
committer Dave Airlie <airlied@redhat.com> 1392162676 +1000

Merge tag 'drm-intel-fixes-2014-02-11' of ssh://git.freedesktop.org/git/drm-intel into drm-next

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