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)
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


Trivial merge