From: Dave Airlie <airlied@redhat.com>
Date: Sun, 22 Aug 2010 22:34:59 +0000 (+1000)
Subject: Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-core... 
X-Git-Tag: upstream/snapshot3+hdmi~13117^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d03330383c9255cdb184dd33594e89c3542f191b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-core-next

* 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next:
  drm/nouveau: fix earlier mistake when fixing merge conflict
  drm/nvc0: fix thinko in instmem suspend/resume
  drm/nouveau: Workaround missing GPIO tables on an Apple iMac G4 NV18.
  drm/nouveau: Add TV-out quirk for an MSI nForce2 IGP.
  drm/nv50-nvc0: ramht_size is meant to be in bytes, not entries
  drm/nouveau: punt some more log messages to debug level
  drm/nouveau: remove warning about unknown tmds table revisions
  drm/nouveau: check for error when allocating/mapping dummy page
  drm/nouveau: fix race condition when under memory pressure
  drm/nv50: fix minor thinko from nvc0 changes
  drm/nouveau: Don't try DDC on the dummy I2C channel.
---

d03330383c9255cdb184dd33594e89c3542f191b