projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1795cd9 bb78e7a)
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)
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


Trivial merge