projects / platform / kernel / linux-rpi3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 009d043 226d63a)
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)
commitd87c0e3d9f42cd3582498eac2d7409cc0361c0cb
tree545ab7e4d45008af6dc61b9c6ae5bc8ea85c433btree | snapshot
parent009d0431c3914de64666bec0d350e54fdd59df6acommit | diff
parent226d63a1addea8cbe8fc671978e62dc84927b046commit | 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
Domain: System / Kernel; Licenses: GPL-2.0;