Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jan 2016 21:06:35 +0000 (13:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jan 2016 21:06:35 +0000 (13:06 -0800)
Pull drm nouveau fix from Dave Airlie:
 "Still not back to work, but I decided to forward this fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau/gr/nv40: fix oops in interrupt handler


Trivial merge