| commit | b9020c9e5953f6938e1968ba0034b46292ac5d51 | |
| author | Dave Airlie <airlied@gmail.com> | |
| Fri, 28 Jan 2011 01:12:53 +0000 (28 11:12 +1000) | ||
| committer | Dave Airlie <airlied@gmail.com> | |
| Fri, 28 Jan 2011 01:12:53 +0000 (28 11:12 +1000) | ||
| tree | a5155fc1a616da4832711e41bb761e4a7cec8d45 | treesnapshot (tar.gz zip) |
| parent | 1e644d6dce366a7bae22484f60133b61ba322911 | commitdiff |
| parent | 153e019ff398063b8486acadfad9adb806e99474 | commitdiff |
Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
drm/nv50: fix regression on IGPs
* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
drm/nv50: fix regression on IGPs