From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Jan 2016 21:06:35 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: firefly_0821_release~176^2~493
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=02006f7a7a715af10974a30b7ad8e6ee340f954c;p=firefly-linux-kernel-4.4.55.git

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
---

02006f7a7a715af10974a30b7ad8e6ee340f954c