From: Dave Airlie Date: Tue, 18 Feb 2014 22:20:14 +0000 (+1000) Subject: Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=560591f13e2f000977d887b31689f6b4d090ac4e;p=deliverable%2Flinux.git Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Fix for 128x128 cursors, along with some misc fixes. * 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux: drm/radeon/ni: fix typo in dpm sq ramping setup drm/radeon/si: fix typo in dpm sq ramping setup drm/radeon: fix CP semaphores on CIK drm/radeon: delete a stray tab drm/radeon: fix display tiling setup on SI drm/radeon/dpm: reduce r7xx vblank mclk threshold to 200 drm/radeon: fill in DRM_CAPs for cursor size drm: add DRM_CAPs for cursor size drm/radeon: unify bpc handling --- 560591f13e2f000977d887b31689f6b4d090ac4e