diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-10-01 19:27:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-10-01 19:27:38 +1000 |
| commit | 7a42e83d36d2d0a68622320900dc4e880b1d920a (patch) | |
| tree | 3671f64e59894284cb7a946d9ab981a1f71e669b /lib/mpi/mpi-bit.c | |
| parent | Merge tag 'topic/core-stuff-2014-09-29' of git://anongit.freedesktop.org/drm-intel into drm-next (diff) | |
| parent | drm/nouveau: export reservation_object from dmabuf to ttm (diff) | |
| download | wireguard-linux-7a42e83d36d2d0a68622320900dc4e880b1d920a.tar.xz wireguard-linux-7a42e83d36d2d0a68622320900dc4e880b1d920a.zip | |
Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux into drm-next
fixups for nouveau and fencing
* 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux:
drm/nouveau: export reservation_object from dmabuf to ttm
drm/ttm: add reservation_object as argument to ttm_bo_init
drm: Pass dma-buf as argument to gem_prime_import_sg_table
drm/nouveau: assign fence_chan->name correctly
drm/nouveau: specify if interruptible wait is desired in nouveau_fence_sync
drm/nouveau: bump driver patchlevel to 1.2.1
Diffstat (limited to 'lib/mpi/mpi-bit.c')
0 files changed, 0 insertions, 0 deletions