tree b2b570b740e0f1e2ac5c754d955802d6584e20c6
parent 1d8b0e79083d229829a408cd016dc4a038f637dd
parent 3bea6a4c7895fc94965a219a8da9bcf753667901
author Linus Torvalds <torvalds@linux-foundation.org> 1452200795 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1452200795 -0800

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

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