Merge branch 'linux-4.6' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 22 Apr 2016 00:09:33 +0000 (10:09 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 22 Apr 2016 00:09:33 +0000 (10:09 +1000)
transform feedback fix.

* 'linux-4.6' of git://github.com/skeggsb/linux:
  drm/nouveau/gr/gf100: select a stream master to fixup tfb offset queries


Trivial merge