From: Dave Airlie <airlied@redhat.com>
Date: Wed, 23 May 2012 09:46:24 +0000 (+0100)
Subject: Merge branch 'prime-merge' of ssh://people.freedesktop.org/~airlied/linux into drm... 
X-Git-Tag: v3.5-rc1~100^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b2ba70091c1bef1dfb3677db229dc5392dfec8c;p=pandora-kernel.git

Merge branch 'prime-merge' of ssh://people.freedesktop.org/~airlied/linux into drm-core-next

* '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
---

5b2ba70091c1bef1dfb3677db229dc5392dfec8c
Reading git-diff-tree failed