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)
commit6b654af5e694754672894c134eb50cfa2b79dc2e
treeac2c05bcab401670711ad824613294b5cf361162
parent8337486a8fda53e5f46b3cb2b4eb3272608348cb
parent3840a656f61fdc504f1b0c6617f6af800d551efe
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