From: Dave Airlie <airlied@redhat.com>
Date: Fri, 22 Apr 2016 00:09:33 +0000 (+1000)
Subject: Merge branch 'linux-4.6' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: v4.6-rc5~15^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=005e8dad01d2a7b98948927d7e0c4c7c61ec2d69;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'linux-4.6' of git://github.com/skeggsb/linux into drm-fixes

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
---

005e8dad01d2a7b98948927d7e0c4c7c61ec2d69