]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdb444de7db84fe9abffbe78238d8c78f01deb79b
tree3671f64e59894284cb7a946d9ab981a1f71e669b
parent0c502543cb53918512c1c4ebff71f9f2ccd1e744
parent51d0ba9ea97383ba62009158eec3910bf4f51284
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