| commit | 6b15835282f9c6a023e2625455bfdb822bb9cc64 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Feb 18 15:09:12 2010 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Feb 18 15:09:12 2010 +1000 |
| tree | a15eece7611ed6b013317751d63839aad3f35653 | |
| parent | 94429bb6c8343722544e282d89dc4638672e49b4 [diff] | |
| parent | bf929efa56ac174bf6d4f54cd6fe811181a51ae5 [diff] |
Merge branch 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-linus * 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau: Force TV encoder DPMS reinit after resume. drm/nouveau: use mutex for vbios lock