From: Dave Airlie Date: Thu, 28 Aug 2014 03:45:45 +0000 (+1000) Subject: Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm... X-Git-Tag: firefly_0821_release~176^2~3035^2~74 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=04cd214516d8a6f0f8c0116185d6e360df0860d2;p=firefly-linux-kernel-4.4.55.git 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 --- 04cd214516d8a6f0f8c0116185d6e360df0860d2