Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6...
authorDave Airlie <airlied@redhat.com>
Thu, 4 Sep 2014 23:27:33 +0000 (09:27 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 4 Sep 2014 23:27:33 +0000 (09:27 +1000)
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


Trivial merge