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
This commit is contained in:
Dave Airlie 2014-09-19 10:41:12 +10:00
commit 6b654af5e6