Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2...
authorDave Airlie <airlied@gmail.com>
Fri, 28 Jan 2011 01:12:53 +0000 (11:12 +1000)
committerDave Airlie <airlied@gmail.com>
Fri, 28 Jan 2011 01:12:53 +0000 (11:12 +1000)
* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nv50: fix regression on IGPs


Trivial merge