]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8c4fc74e8dd7f22ee8c5b9a3ed9b338d6560f217
tree2a0e91b5a10ecadaa96f82b29e79f8f9ef557ca9
parent4c7e319d04d696f160dcdb0338778a6cade6348e
parentfcef5fd1465e6f27deacdc371088d0608e20856a
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