tree 40cc68e8a16dda2b6d4193bdf44194a5def3bbc3
parent a55205e229e4e16559cc2593fdfc37902b248879
parent c4534fdf5603ef53fce2f418df7b5a19e71281e3
author Dave Airlie <airlied@redhat.com> 1296610142 +1000
committer Dave Airlie <airlied@redhat.com> 1296610142 +1000

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