Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux...
authorDave Airlie <airlied@redhat.com>
Thu, 2 May 2013 07:33:25 +0000 (17:33 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 2 May 2013 07:33:25 +0000 (17:33 +1000)
Add GK110 modesetting suport.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nve0: recognise nvf0 as a kepler board (GK110)
  drm/nouveau: force noaccel when no PFIFO support present
  drm/nvf0/disp: expose display class 2.2


Trivial merge