]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ba45561 6e547b8)
Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6...
authorDave Airlie <airlied@redhat.com>
Tue, 2 Dec 2014 05:40:16 +0000 (15:40 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 2 Dec 2014 05:40:16 +0000 (15:40 +1000)
commit5a345ee70c4365e64c58e9a65f37e9d7b17afb39
tree545ab7e4d45008af6dc61b9c6ae5bc8ea85c433btree | snapshot
parentba45561728c20faf2120fe597ce796d19e8b6a88commit | diff
parent6e547b81add0711af023dc6e4ea9f7b66354687ccommit | diff
Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Just a couple of fixes for the fallout from the fence rework.

* 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/gf116: remove copy1 engine
  drm/nouveau: prevent stale fence->channel pointers, and protect with rcu
  drm/nouveau/fifo/g84-: ack non-stall interrupt before handling it
Linux Kernel Source Tree.