| commit | 5f2fcdbd100e4f296141d23d03413c1303d97bed | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Nov 13 09:10:58 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Nov 13 09:10:58 2014 +1000 |
| tree | 4be85742de15873dfdbb348b422f0b2505974462 | |
| parent | 3b548f4a69b02091031ee60c9a477463f7145963 [diff] | |
| parent | 1c9498425453bb65ef339a57705c5ef59fe1541d [diff] |
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