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)
commite98ce0d7cfa6ee0650a63d45558a5121383995d9
tree40cc68e8a16dda2b6d4193bdf44194a5def3bbc3
parenta55205e229e4e16559cc2593fdfc37902b248879
parentc4534fdf5603ef53fce2f418df7b5a19e71281e3
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