From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Nov 2012 19:14:24 +0000 (-1000)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0e0f092ef0c474c3996c8e023d1724f4f72132ad;p=~shefty%2Frdma-dev.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie.

Small fixes for (mostly Nouveau, some radeon) regressions.

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: use the correct fence implementation for nv50
  drm/radeon: add new SI pci id
  radeon: add AGPMode 1 quirk for RV250
  drm/radeon: properly track the crtc not_enabled case evergreen_mc_stop()
  drm/nouveau/bios: fix DCB v1.5 parsing
  drm/nouveau: add missing pll_calc calls
  drm/nouveau: fix crash with noaccel=1
  drm/nv40: allocate ctxprog with kmalloc
  drm/nvc0/disp: fix thinko in vblank regression fix..
---

0e0f092ef0c474c3996c8e023d1724f4f72132ad