From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Nov 2012 05:49:24 +0000 (+0100)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: firefly_0821_release~3680^2~1667
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c0cba03baa0d285b1a8f9d3481be1868df7af1ad;p=firefly-linux-kernel-4.4.55.git

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

Pull drm fixes from Dave Airlie:
 "Just radeon and nouveau, mostly regressions fixers, and a couple of
  radeon register checker fixes."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: fix acpi edid retrieval
  drm/nvc0/disp: fix regression in vblank semaphore release
  drm/nv40/mpeg: fix context handling
  drm/nv40/graph: fix typo in type names
  drm/nv41/vm: fix typo in type name
  drm/radeon/si: add some missing regs to the VM reg checker
  drm/radeon/cayman: add some missing regs to the VM reg checker
  drm/radeon/dce3: switch back to old pll allocation order for discrete
---

c0cba03baa0d285b1a8f9d3481be1868df7af1ad