Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6...
authorDave Airlie <airlied@redhat.com>
Mon, 20 Oct 2014 06:14:19 +0000 (16:14 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 20 Oct 2014 06:14:19 +0000 (16:14 +1000)
two nouveau fixes.

* 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: fix regression on agp boards
  drm/gt215/gr: fix initialisation on gddr5 boards

1  2 
drivers/gpu/drm/nouveau/nouveau_chan.c