Merge branch 'prime-merge' of ssh://people.freedesktop.org/~airlied/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 23 May 2012 09:46:24 +0000 (10:46 +0100)
committerDave Airlie <airlied@redhat.com>
Wed, 23 May 2012 09:46:24 +0000 (10:46 +0100)
* 'prime-merge' of ssh://people.freedesktop.org/~airlied/linux:
  drm/radeon: add PRIME support (v2)
  i915: add dmabuf/prime buffer sharing support.
  nouveau: add PRIME support
  ttm: add prime sharing support to TTM (v2)
  udl: add prime fd->handle support.
  drm/prime: add exported buffers to current fprivs imported buffer list (v2)
  drm/prime: introduce sg->pages/addr arrays helper


Trivial merge