Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Thu, 7 Jul 2016 02:40:12 +0000 (12:40 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 7 Jul 2016 02:40:12 +0000 (12:40 +1000)
Just one fix for a stupid thinko in a DP training pattern commit.

* 'linux-4.7' of git://github.com/skeggsb/linux:
  drm/nouveau/disp/sor/gf119: select correct sor when poking training pattern


Trivial merge