Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux...
authorDave Airlie <airlied@redhat.com>
Fri, 9 Nov 2012 04:57:02 +0000 (14:57 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 9 Nov 2012 04:57:02 +0000 (14:57 +1000)
commit4a48ed2334b7ae61dd11bb114fa35bd4ebdc1ca0
treebb2e8434aab2016a807dd24aa8c75a16a639cf63
parent022d1a2942e072937f42bd3447e0059c220de58e
parentdf285500b203a5603b1cdd1b16f42ab7a3544d7b
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

just some misc regression fixes and typo fixes.

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  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