Merge branch 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 15 Apr 2015 22:00:06 +0000 (08:00 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 15 Apr 2015 22:00:06 +0000 (08:00 +1000)
commitfc16fc4d69d5f1b67d3d6ac97bd3b4e1cc3f74cc
treeb91ebdc1c6621a8787b3994e45b5d8e02de5340e
parent665ae581ae82ed6a28980a32b9d37345db4eed32
parent49ecb10e01c68b05dcb73005a54430c15caa05d0
Merge branch 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-next

Some final bits for 4.1.  Some fixes for userptrs and allow a new
packet for VCE to enable some new features in mesa.

* 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: allow creating overlapping userptrs
  drm/radeon: add userptr config option
  drm/radeon: add video usability info support for VCE