From: Dave Airlie <airlied@redhat.com>
Date: Thu, 30 Jan 2014 00:46:06 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Tag: v3.14-rc1~47^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ef64cf9d06049e4e9df661f3be60b217e476bee1;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

more fixes for nouveau.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: resume display if any later suspend bits fail
  drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip
  drm/nouveau: implement hooks for needed for drm vblank timestamping support
  drm/nouveau/disp: add a method to fetch info needed by drm vblank timestamping
  drm/nv50: fill in crtc mode struct members from crtc_mode_fixup
---

ef64cf9d06049e4e9df661f3be60b217e476bee1