From: Dave Airlie <airlied@redhat.com>
Date: Thu, 18 Feb 2010 05:09:12 +0000 (+1000)
Subject: Merge branch 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6 into... 
X-Git-Tag: v3.0~5971^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b15835282f9c6a023e2625455bfdb822bb9cc64;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

6b15835282f9c6a023e2625455bfdb822bb9cc64