From: Dave Airlie <airlied@redhat.com>
Date: Thu, 19 Sep 2013 01:47:23 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Tag: v3.12-rc2~3^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f7d1bc973ec71dfeeb951765cafe1ff3a63243e;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

A couple of bios parser fixes (one for ancient chips, another for new ones - important in Optimus configs).  Another to make sure KMS is enabled on certain Optimus configs, and a TTM failure path fix.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/ttm: prevent double-free in nouveau_sgdma_create_ttm() failure path
  drm/nouveau/bios/init: fix thinko in INIT_CONFIGURE_MEM
  drm/nouveau/kms: enable for non-vga pci classes
  drm/nouveau/bios/init: stub opcode 0xaa
---

4f7d1bc973ec71dfeeb951765cafe1ff3a63243e