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)
commit27c0b7419c3a9249b72a67f2c575e22aedd67a67
tree6a9af660835b62e95683b4f646f807480bd56a20
parentfd50870296d6e73ff277d9f1a518d68c95d17f63
parent217215041b9285af2193a755b56a8f3ed408bfe2
Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes

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