From: Dave Airlie <airlied@redhat.com>
Date: Tue, 15 Jul 2014 03:25:58 +0000 (+1000)
Subject: Merge branch 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=85d9e14cfde5393980c3dc29b9f3ef0d30424dfc;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

deadlock fix.

* 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/therm: fix a potential deadlock in the therm monitoring code
---

85d9e14cfde5393980c3dc29b9f3ef0d30424dfc