diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-02-18 15:09:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-02-18 15:09:12 +1000 |
| commit | 6b15835282f9c6a023e2625455bfdb822bb9cc64 (patch) | |
| tree | a15eece7611ed6b013317751d63839aad3f35653 /drivers/gpu/vga/vgaarb.c | |
| 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
Diffstat (limited to 'drivers/gpu/vga/vgaarb.c')
0 files changed, 0 insertions, 0 deletions