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)
* '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


Trivial merge