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)
commitf468400664e3ae79e6e001bb2820c79bebe6aa41
tree0f78e9bfe17bfa2e05ed804582e484d458d2cb8f
parentb11b88ef0e07a1ea9a3df6666ba8e15833facc67
parent7b4f638b3a611118324328a18c842e26996493fe
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

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