tree 21d424834879b6128ce0c05f467d54dd8da67364
parent cdfe1565c094f60fef00238884aff2c781dd0784
parent 4a48ed2334b7ae61dd11bb114fa35bd4ebdc1ca0
author Linus Torvalds <torvalds@linux-foundation.org> 1352440164 +0100
committer Linus Torvalds <torvalds@linux-foundation.org> 1352440164 +0100

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