tree a15eece7611ed6b013317751d63839aad3f35653
parent 94429bb6c8343722544e282d89dc4638672e49b4
parent bf929efa56ac174bf6d4f54cd6fe811181a51ae5
author Dave Airlie <airlied@redhat.com> 1266469752 +1000
committer Dave Airlie <airlied@redhat.com> 1266469752 +1000

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