From: Dave Airlie Date: Wed, 29 Jul 2015 07:21:38 +0000 (+1000) Subject: Merge branch 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=520e8bfc35066d4344adf13081e59bfde30aa36d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes Two more nouveau fixes. * 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/nouveau/ttm: fix tiled system memory with Maxwell drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads --- 520e8bfc35066d4344adf13081e59bfde30aa36d