Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 12 Nov 2014 23:10:58 +0000 (09:10 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 12 Nov 2014 23:10:58 +0000 (09:10 +1000)
commit5f2fcdbd100e4f296141d23d03413c1303d97bed
tree4be85742de15873dfdbb348b422f0b2505974462
parent3b548f4a69b02091031ee60c9a477463f7145963
parent1c9498425453bb65ef339a57705c5ef59fe1541d
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