From: Dave Airlie <airlied@redhat.com>
Date: Wed, 2 Feb 2011 01:29:02 +0000 (+1000)
Subject: Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into... 
X-Git-Tag: v2.6.38-rc4~17^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e98ce0d7cfa6ee0650a63d45558a5121383995d9;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into drm-fixes

* 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next:
  drm/nv50: fix display on 0x50
  drm/nouveau: correctly pair hwmon_init and hwmon_fini
---

e98ce0d7cfa6ee0650a63d45558a5121383995d9