Merge branch 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6 into...
authorDave Airlie <airlied@redhat.com>
Thu, 18 Feb 2010 05:09:12 +0000 (15:09 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 18 Feb 2010 05:09:12 +0000 (15:09 +1000)
commit6b15835282f9c6a023e2625455bfdb822bb9cc64
treea15eece7611ed6b013317751d63839aad3f35653
parent94429bb6c8343722544e282d89dc4638672e49b4
parentbf929efa56ac174bf6d4f54cd6fe811181a51ae5
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