Merge branch 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6...
authorDave Airlie <airlied@redhat.com>
Tue, 15 Jul 2014 03:25:58 +0000 (13:25 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 15 Jul 2014 03:25:58 +0000 (13:25 +1000)
commit85d9e14cfde5393980c3dc29b9f3ef0d30424dfc
tree2a0e91b5a10ecadaa96f82b29e79f8f9ef557ca9
parent1795cd9b3a91d4b5473c97f491d63892442212ab
parentbb78e7a12aa4898901d44bcb9d418f4188594427
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