]> 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)
commitb7ec4753b8840725edab13c8f735925c099f777f
tree2a0e91b5a10ecadaa96f82b29e79f8f9ef557ca9
parent55c81957587c624c3b752b33e0ecc9ff12cebe14
parent0fd07696569e6c6f363f8e1bcd7b49815ccd410d
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