From: Dave Airlie Date: Thu, 2 Oct 2014 04:48:20 +0000 (+1000) Subject: Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6... X-Git-Tag: firefly_0821_release~176^2~3152^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=19318c063bf51f030c7c632f6a876c43da7de65d;p=firefly-linux-kernel-4.4.55.git Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes A few regression fixes, the runpm ones dating back to 3.15. Also a fairly severe TMDS regression that effected a lot of GF8/9/GT2xx users. * 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau: make sure display hardware is reinitialised on runtime resume drm/nouveau: punt fbcon resume out to a workqueue drm/nouveau: fix regression on original nv50 board drm/nv50/disp: fix dpms regression on certain boards --- 19318c063bf51f030c7c632f6a876c43da7de65d