projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff7c60c 5f97ab9)
Merge branch 'drm-nouveau-fixes-3.8' of git://anongit.freedesktop.org/git/nouveau...
authorDave Airlie <airlied@redhat.com>
Sun, 10 Feb 2013 23:40:14 +0000 (09:40 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 10 Feb 2013 23:40:14 +0000 (09:40 +1000)
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

1  2 
drivers/gpu/drm/nouveau/nouveau_drm.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge
John Crispins staging tree