Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux...
authorDave Airlie <airlied@redhat.com>
Wed, 1 Oct 2014 09:27:38 +0000 (19:27 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 1 Oct 2014 09:27:38 +0000 (19:27 +1000)
commit7a42e83d36d2d0a68622320900dc4e880b1d920a
tree3671f64e59894284cb7a946d9ab981a1f71e669b
parentc5939a7360a69fc415bcfff6b10ced5227495a48
parentbb6178b04f5ef6f62990306713fb6afdf5d8bc56
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