From: Dave Airlie <airlied@redhat.com>
Date: Mon, 12 Oct 2015 03:59:04 +0000 (+1000)
Subject: Merge branch 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7b98040a7718663903bb25c06c7aed9801abbd9d;p=linux-beck.git

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

Nothing too crazy here, a couple of regression fixes + runpm/fbcon
race fix.

* 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/bios: fix OF loading
  drm/nouveau/fbcon: take runpm reference when userspace has an open fd
  drm/nouveau/nouveau: Disable AGP for SiS 761
  drm/nouveau/display: allow up to 16k width/height for fermi+
  drm/nouveau/bios: translate devinit pri/sec i2c bus to internal identifiers
---

7b98040a7718663903bb25c06c7aed9801abbd9d