| commit | e98ce0d7cfa6ee0650a63d45558a5121383995d9 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Feb 02 11:29:02 2011 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Feb 02 11:29:02 2011 +1000 |
| tree | 40cc68e8a16dda2b6d4193bdf44194a5def3bbc3 | |
| parent | a55205e229e4e16559cc2593fdfc37902b248879 [diff] | |
| parent | c4534fdf5603ef53fce2f418df7b5a19e71281e3 [diff] |
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