tree 2a0e91b5a10ecadaa96f82b29e79f8f9ef557ca9
parent 1795cd9b3a91d4b5473c97f491d63892442212ab
parent bb78e7a12aa4898901d44bcb9d418f4188594427
author Dave Airlie <airlied@redhat.com> 1405394758 +1000
committer Dave Airlie <airlied@redhat.com> 1405394758 +1000

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