tree e660e76b8845ff406ea3530ce2f097dd1a91d151
parent 4a10c2ac2f368583138b774ca41fac4207911983
parent d32270460fee83e22ee9e6b1bfd7b486263eeb1d
author Dave Airlie <airlied@redhat.com> 1380322004 +1000
committer Dave Airlie <airlied@redhat.com> 1380322004 +1000

Merge tag 'drm-intel-fixes-2013-09-26' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Just a few fixes for regressions and other serious stuff.

Two fix state tracking mismatches, together with an additional patch that
I've submitted to stable (somehow forgotten to tag it) we should have them
fixed now (I hope).

* tag 'drm-intel-fixes-2013-09-26' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: Fix up usage of SHRINK_STOP
  drm/i915: preserve pipe A quirk in i9xx_set_pipeconf
  drm/i915/tv: clear adjusted_mode.flags
  drm/i915/dp: increase i2c-over-aux retry interval on AUX DEFER
  drm/i915: Use a temporary va_list for two-pass string handling