From: Dave Airlie Date: Thu, 4 Sep 2014 23:27:33 +0000 (+1000) Subject: Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6... X-Git-Tag: v5.4.17~14494^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=68c78bd67bd6f868474ac75d98ea7d6ebf28d2e7;p=arm%2Flinux.git Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes single fix for nouveau. * 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/core: don't leak oclass type bits to user --- 68c78bd67bd6f868474ac75d98ea7d6ebf28d2e7