Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 28 Aug 2014 03:45:45 +0000 (13:45 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 28 Aug 2014 03:45:45 +0000 (13:45 +1000)
commit04cd214516d8a6f0f8c0116185d6e360df0860d2
treeef2896a8e05be32c2d62911da795dc5106f17030
parent6adae108b2fb0c7b945e297e4a0f0b7d66599656
parentfeba9b0bcf492ba991d7fbfc211dd49ebbc95a4b
Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next

Just clearing out my -next queue before I go on vacation.  Two UVD
improvements that depend on the ttm change you just merged.

* 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: preallocate mem for UVD create/destroy msg
  drm/radeon: allow UVD to use a second 256MB segment