From: Dave Airlie <airlied@redhat.com>
Date: Mon, 25 Aug 2014 23:05:14 +0000 (+1000)
Subject: Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: fixes-against-v3.18-rc2~73^2~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=484048db6b4890bc433aac7f5e32fdcf1b2b4786;p=pandora-kernel.git

Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next

radeon userptr support.

* 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: allow userptr write access under certain conditions
  drm/radeon: add userptr flag to register MMU notifier v3
  drm/radeon: add userptr flag to directly validate the BO to GTT
  drm/radeon: add userptr flag to limit it to anonymous memory v2
  drm/radeon: add userptr support v8

Conflicts:
	drivers/gpu/drm/radeon/radeon_prime.c
---

484048db6b4890bc433aac7f5e32fdcf1b2b4786
Reading git-diff-tree failed