From: Dave Airlie <airlied@redhat.com>
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: v3.17-rc4~20^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=68c78bd67bd6f868474ac75d98ea7d6ebf28d2e7;p=linux-2.6-block.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