From: Dave Airlie <airlied@redhat.com>
Date: Tue, 6 May 2014 23:06:21 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~207^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc;p=pandora-kernel.git

Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

nouveau fixes.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/gm107/gr: bump attrib cb size quite a bit
  drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip
  drm/nouveau/bios: fix shadowing from PROM on big-endian systems
  drm/nouveau/acpi: allow non-optimus setups to load vbios from acpi
---

2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc
Reading git-diff-tree failed