From: Dave Airlie <airlied@redhat.com>
Date: Thu, 13 Nov 2014 20:24:50 +0000 (+1000)
Subject: Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6... 
X-Git-Tag: v3.18-rc5~10^2~1
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=3d0f8536cd24079a68a53266517f6ab85d7d6f5b

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

One modesetting, one gk20a fix.

* 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/nv50/disp: Fix modeset on G94
  drm/gk20a/fb: fix setting of large page size bit
---

3d0f8536cd24079a68a53266517f6ab85d7d6f5b