From: Dave Airlie <airlied@redhat.com>
Date: Thu, 2 May 2013 07:33:25 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Tag: v3.10-rc2~14^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f468400664e3ae79e6e001bb2820c79bebe6aa41;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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
---

f468400664e3ae79e6e001bb2820c79bebe6aa41