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


Trivial merge