From: Dave Airlie <airlied@redhat.com>
Date: Fri, 9 Nov 2012 04:57:02 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~13686^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4a48ed2334b7ae61dd11bb114fa35bd4ebdc1ca0;p=mirror_ubuntu-artful-kernel.git

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
---

4a48ed2334b7ae61dd11bb114fa35bd4ebdc1ca0