projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.