Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Thu, 7 Jan 2016 07:18:45 +0000 (17:18 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 7 Jan 2016 07:18:45 +0000 (17:18 +1000)
commit3bea6a4c7895fc94965a219a8da9bcf753667901
tree1938d3793ba2238bfdd817f5985e57a91156b2a1
parentb06f3a168cdcd80026276898fd1fee443ef25743
parent9daf38f4fcca509d198fa4184760d55cd30a7b31
Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes

single nv40 oops fix.

* 'linux-4.4' of git://github.com/skeggsb/linux:
  drm/nouveau/gr/nv40: fix oops in interrupt handler