From: Dave Airlie Date: Sun, 10 Feb 2013 23:40:14 +0000 (+1000) Subject: Merge branch 'drm-nouveau-fixes-3.8' of git://anongit.freedesktop.org/git/nouveau... X-Git-Tag: firefly_0821_release~3680^2~1151^2~1 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e28f639eeaa97b6029b0db8890b2a4ce99e642c6;p=firefly-linux-kernel-4.4.55.git Merge branch 'drm-nouveau-fixes-3.8' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next Fixes for one major lockdep warning, one oops reported by a few people, and fix for a long hang on some gpu engines. * 'drm-nouveau-fixes-3.8' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau: add lockdep annotations drm/nv50/fb: Fix nullptr-deref on IGPs drm/nouveau: use different register to wait for secret scrubber --- e28f639eeaa97b6029b0db8890b2a4ce99e642c6