diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-12-02 15:40:16 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-02 15:40:16 +1000 |
| commit | d87c0e3d9f42cd3582498eac2d7409cc0361c0cb (patch) | |
| tree | 545ab7e4d45008af6dc61b9c6ae5bc8ea85c433b /lib/mpi/mpi-bit.c | |
| parent | Linux 3.18-rc7 (diff) | |
| parent | drm/nouveau/gf116: remove copy1 engine (diff) | |
| download | wireguard-linux-d87c0e3d9f42cd3582498eac2d7409cc0361c0cb.tar.xz wireguard-linux-d87c0e3d9f42cd3582498eac2d7409cc0361c0cb.zip | |
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
Diffstat (limited to 'lib/mpi/mpi-bit.c')
0 files changed, 0 insertions, 0 deletions