From: Dave Airlie <airlied@redhat.com>
Date: Mon, 19 Nov 2012 04:03:27 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Tag: v3.7-rc7~20^2~2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=776d1e38c5934ba4d2e300fe4208602babae4c1d;p=~andy%2Flinux

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

Some more misc fallout from nouveau rework.

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  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..
---

776d1e38c5934ba4d2e300fe4208602babae4c1d