tree ef2896a8e05be32c2d62911da795dc5106f17030
parent 6adae108b2fb0c7b945e297e4a0f0b7d66599656
parent feba9b0bcf492ba991d7fbfc211dd49ebbc95a4b
author Dave Airlie <airlied@redhat.com> 1409197545 +1000
committer Dave Airlie <airlied@redhat.com> 1409197545 +1000

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