Merge branch 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into...
authorDave Airlie <airlied@redhat.com>
Mon, 12 Oct 2015 03:59:04 +0000 (13:59 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 12 Oct 2015 03:59:04 +0000 (13:59 +1000)
commit7b98040a7718663903bb25c06c7aed9801abbd9d
tree8920d665e9ef2016fe0c378f30e16ac17cea8283
parent621bd0f6982badd6483acb191eb7b6226a578328
parent25d295882a1adfcdaaad85369289677b87c7c8f0
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