From: Dave Airlie <airlied@redhat.com>
Date: Mon, 22 Oct 2012 07:50:07 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ae168d973f5fa3f3467dc5600f74a0f03e3cafe7;p=openwrt%2Fstaging%2Fblogic.git

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

Fixes from Ben, off note:
ACPI ROM regression fix,
some IGP and AGP regressions fixes from rework fallout.

* 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/clock: fix missing pll type/addr when matching default entry
  drm/nouveau/fb: fix reporting of memory type on GF8+ IGPs
  drm/nv41/vm: don't init hw pciegart on boards with agp bridge
  drm/nouveau/bios: fetch full 4KiB block to determine ACPI ROM image size
  drm/nouveau: validate vbios size
  drm/nouveau: warn when trying to free mm which is still in use
  drm/nouveau: fix nouveau_mm/nouveau_mm_node leak
  drm/nouveau/bios: improve error handling when reading the vbios from ACPI
  drm/nouveau: handle same-fb page flips
---

ae168d973f5fa3f3467dc5600f74a0f03e3cafe7