Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into...
authorDave Airlie <airlied@redhat.com>
Wed, 2 Feb 2011 01:29:02 +0000 (11:29 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 2 Feb 2011 01:29:02 +0000 (11:29 +1000)
* '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


Trivial merge