From: Dave Airlie Date: Fri, 29 May 2015 01:13:52 +0000 (+1000) Subject: Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1fe7142063517dfb17bfd3ada394e1dd7ee44ba7;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes Regression fix for Fermi acceleration, and fixes important to bringing up display-less Maxwell boards. * 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/gr/gm204: remove a stray printk drm/nouveau/devinit/gm100-: force devinit table execution on boards without PDISP drm/nouveau/devinit/gf100: make the force-post condition more obvious drm/nouveau/gr/gf100-: fix wrong constant definition --- 1fe7142063517dfb17bfd3ada394e1dd7ee44ba7