diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-11 09:40:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-11 09:40:14 +1000 |
| commit | e28f639eeaa97b6029b0db8890b2a4ce99e642c6 (patch) | |
| tree | f35c61e3b70297299f6d7c18db3e078d1e04aa8f /drivers/gpu/drm/radeon/evergreen_cs.c | |
| parent | ff7c60c580d9722f820d85c9c58ca55ecc1ee7c4 (diff) | |
| parent | 5f97ab913cf0fbc378ea8ffc3ee66f4890d11c55 (diff) | |
Merge branch 'drm-nouveau-fixes-3.8' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Fixes for one major lockdep warning, one oops reported by a few people, and
fix for a long hang on some gpu engines.
* 'drm-nouveau-fixes-3.8' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: add lockdep annotations
drm/nv50/fb: Fix nullptr-deref on IGPs
drm/nouveau: use different register to wait for secret scrubber
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_cs.c')
0 files changed, 0 insertions, 0 deletions