From: Dave Airlie Date: Wed, 12 Nov 2014 23:10:58 +0000 (+1000) Subject: Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm... X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~107^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f2fcdbd100e4f296141d23d03413c1303d97bed;p=pandora-kernel.git Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes atom scratch register race fix. * 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: add locking around atombios scratch space usage --- 5f2fcdbd100e4f296141d23d03413c1303d97bed