tree 47111c1e2c74ecff6683d38be614c40e93baf53a
parent 0b07194bb55ed836c2cc7c22e866b87a14681984
parent d324c5bc462d354d337dcf3a14ffd0eb17b4fa38
author Dave Airlie <airlied@redhat.com> 1509494703 +1000
committer Dave Airlie <airlied@redhat.com> 1509494703 +1000

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

single nouveau regression fix.

* 'linux-4.14' of git://github.com/skeggsb/linux:
  drm/nouveau/kms/nv50: use the correct state for base channel notifier setup