From: Dave Airlie <airlied@redhat.com>
Date: Fri, 15 Jan 2010 03:22:59 +0000 (+1000)
Subject: Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c974dc21898f9abbcb5e47ae9ddb7e6b473de2e;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus

* 'nouveau/for-airlied' of ../drm-nouveau-next: (44 commits)
  drm/nouveau: check pushbuffer bounds in ioctl
  drm/nouveau: reserve VGA area for the moment
  drm/nouveau: Unset the EDID connector property when the EDID block goes away.
  drm/nouveau: Fallback to analog load detection when the EDID block is invalid.
  drm/nouveau: fix edid memleak in nouveau_connector
  drm/nouveau: Break some long lines.
  drm/nouveau: add NV18 device id to call_lvds_manufacturer_script
  drm/nv50: Fix typo in PGRAPH initialisation.
  drm/nouveau: less magic DCB 1.5 parsing
  drm/nouveau: assume no nv04 board has a DCB table
  drm/nouveau: remove PRIV0 check in nouveau_mem_close()
  drm/nouveau: wait on fence after bo move if validating for another channel
  drm/nouveau: trust init table registers are safe
  drm/nv50: wait for pgraph to idle before unloading the context
---

1c974dc21898f9abbcb5e47ae9ddb7e6b473de2e