tree a5155fc1a616da4832711e41bb761e4a7cec8d45
parent 1e644d6dce366a7bae22484f60133b61ba322911
parent 153e019ff398063b8486acadfad9adb806e99474
author Dave Airlie <airlied@gmail.com> 1296177173 +1000
committer Dave Airlie <airlied@gmail.com> 1296177173 +1000

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