From: Dave Airlie Date: Wed, 1 Oct 2014 09:27:38 +0000 (+1000) Subject: Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7a42e83d36d2d0a68622320900dc4e880b1d920a;p=linux-beck.git 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 --- 7a42e83d36d2d0a68622320900dc4e880b1d920a