From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Jul 2012 17:59:37 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.5-rc6~23
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=73e6080547429a3cf16f2cceba54891d345f44c2;p=~emulex%2Finfiniband.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "One regression fix, two radeon fixes (one for an oops), and an i915
  fix to unload framebuffers earlier.

  We originally were going to leave the i915 fix until -next, but grub2
  in some situations causes vesafb/efifb to be loaded now, and this
  causes big slowdowns, and I have reports in rawhide I'd like to have
  fixed."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: kick any firmware framebuffers before claiming the gtt
  drm: edid: Don't add inferred modes with higher resolution
  drm/radeon: fix rare segfault
  drm/radeon: fix VM page table setup on SI
---

73e6080547429a3cf16f2cceba54891d345f44c2