| commit | d87c0e3d9f42cd3582498eac2d7409cc0361c0cb | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Dec 02 15:40:16 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Dec 02 15:40:16 2014 +1000 |
| tree | 545ab7e4d45008af6dc61b9c6ae5bc8ea85c433b | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a [diff] | |
| parent | 226d63a1addea8cbe8fc671978e62dc84927b046 [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