[git pull] drm fixes

[Dave Airlie]

Two fixes from Intel, one a regression, one because I merged an early 
version of a fix.

Also the nouveau revert of the i2c code that was tested on the list.

Dave.

The following changes since commit febb72a6e4cc6c8cffcc1ea649a3fb364f1ea432:

  IA32 emulation: Fix build problem for modular ia32 a.out support (2012-05-06 18:26:20 -0700)

are available in the git repository at:
  git://people.freedesktop.org/~airlied/linux drm-fixes

Ben Skeggs (1):
      drm/nouveau/i2c: resume use of i2c-algo-bit, rather than custom stack

Daniel Vetter (2):
      drm/i915: disable sdvo hotplug on i945g/gm
      drm/i915: Do no set Stencil Cache eviction LRA w/a on gen7+

Dave Airlie (1):
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

 drivers/gpu/drm/i915/intel_ringbuffer.c |    9 +-
 drivers/gpu/drm/i915/intel_sdvo.c       |    6 +
 drivers/gpu/drm/nouveau/nouveau_i2c.c   |  199 ++++---------------------------
 drivers/gpu/drm/nouveau/nouveau_i2c.h   |    1 +
 4 files changed, 34 insertions(+), 181 deletions(-)