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

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

diff --cc drivers/gpu/drm/nouveau/core/subdev/bios/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_display.c
index 3ff030d,72e1571..da764a4
--- 1/drivers/gpu/drm/nouveau/nouveau_display.c
--- 2/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@@ -764,12 -764,12 +764,12 @@@ nouveau_crtc_page_flip(struct drm_crtc 
        }
  
        ret = nouveau_page_flip_emit(chan, old_bo, new_bo, s, &fence);
-       mutex_unlock(&chan->cli->mutex);
        if (ret)
                goto fail_unreserve;
+       mutex_unlock(&chan->cli->mutex);
  
        /* Update the crtc struct and cleanup */
 -      crtc->fb = fb;
 +      crtc->primary->fb = fb;
  
        nouveau_bo_fence(old_bo, fence);
        ttm_bo_unreserve(&old_bo->bo);