From: Dave Airlie <airlied@redhat.com>
Date: Fri, 19 Sep 2014 00:41:12 +0000 (+1000)
Subject: Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: firefly_0821_release~176^2~3035^2~21
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6b654af5e694754672894c134eb50cfa2b79dc2e;p=firefly-linux-kernel-4.4.55.git

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

single AGP fix

* 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix AGP userptr handling
---

6b654af5e694754672894c134eb50cfa2b79dc2e