summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-05-02 04:46:01 +1000
committerDave Airlie <airlied@redhat.com>2017-05-02 04:46:01 +1000
commit8b03d1ed2c43a2ba5ef3381322ee4515b97381bf (patch)
tree901e917a8183f84c039011ffec4bbcd06ac5cad0 /scripts
parent73ba2d5c2bd4ecfec8fe37f20e962889b8a4c972 (diff)
parent271393ba6e2ac384a14e581d34d5d72c5953e3c6 (diff)
Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next
Some nouveau regression fixes. * 'linux-4.12' of git://github.com/skeggsb/linux: drm/nouveau/fb/gf100-: Fix 32 bit wraparound in new ram detection drm/nouveau/secboot/gm20b: fix the error return code in gm20b_secboot_tegra_read_wpr() drm/nouveau/kms: Increase max retries in scanout position queries. drm/nouveau/bios/bitP: check that table is long enough for optional pointers drm/nouveau/fifo/nv40: no ctxsw for pre-nv44 mpeg engine
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions