From: Dave Airlie <airlied@redhat.com>
Date: Mon, 20 Oct 2014 06:14:19 +0000 (+1000)
Subject: Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6... 
X-Git-Tag: fixes-against-v3.18-rc2~18^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e800cab3a72892134bde4b72ada063a75683c66b;p=pandora-kernel.git

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

e800cab3a72892134bde4b72ada063a75683c66b
Reading git-diff-tree failed