tree 5fa9718da2caa58042e2d3efa4c018db5c63d38c
parent 3aacfda0ecd9040521fbfb4a2c53cd6bf77ae4ee
parent 2acc868319ed03c0e4b2f747c104d7e2ec0a841f
author Dave Airlie <airlied@redhat.com> 1409873253 +1000
committer Dave Airlie <airlied@redhat.com> 1409873253 +1000

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