Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 19 Sep 2014 00:41:12 +0000 (10:41 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 19 Sep 2014 00:41:12 +0000 (10:41 +1000)
single AGP fix

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


Trivial merge