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)
commit68c78bd67bd6f868474ac75d98ea7d6ebf28d2e7
tree5fa9718da2caa58042e2d3efa4c018db5c63d38c
parent3aacfda0ecd9040521fbfb4a2c53cd6bf77ae4ee
parent2acc868319ed03c0e4b2f747c104d7e2ec0a841f
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