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)
commite800cab3a72892134bde4b72ada063a75683c66b
treea720f47b041bbfd4adffbb619ce1598c333d0f54
parentbee6bd0ad25f396095f0522fd441edfebd25a0cf
parent67e26e41ff8aa514826dae79f0b10169b5ba93b4
Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

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
drivers/gpu/drm/nouveau/nouveau_chan.c