tree ff496137edc34fb1b04a45a09a88c152e367f2bf
parent 45d53766b94b0b773e0090219c1aa3a313f4bb45
parent df63d3ecbca514bad99513b2401448d19a9bb92e
author Linus Torvalds <torvalds@linux-foundation.org> 1371062066 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1371062066 -0700

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

Pull drm fixes from Dave Airlie:
 "Just some GMA500 memory leaks and i915 regression fix due to a
  regression fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: prefer VBT modes for SVDO-LVDS over EDID
  drm/i915: Enable hotplug interrupts after querying hw capabilities.
  drm/i915: Fix hotplug interrupt enabling for SDVOC
  drm/gma500/cdv: Fix cursor gem obj referencing on cdv
  drm/gma500/psb: Fix cursor gem obj referencing on psb
  drm/gma500/cdv: Unpin framebuffer on crtc disable
  drm/gma500/psb: Unpin framebuffer on crtc disable
  drm/gma500: Add fb gtt offset to fb base