From: Dave Airlie <airlied@redhat.com>
Date: Thu, 7 Jul 2016 02:40:12 +0000 (+1000)
Subject: Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=27c0b7419c3a9249b72a67f2c575e22aedd67a67;p=openwrt%2Fstaging%2Fblogic.git

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

27c0b7419c3a9249b72a67f2c575e22aedd67a67