]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into...
authorDave Airlie <airlied@redhat.com>
Fri, 29 May 2015 01:13:52 +0000 (11:13 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 29 May 2015 01:13:52 +0000 (11:13 +1000)
commit1fe7142063517dfb17bfd3ada394e1dd7ee44ba7
tree769fd60024af3a469a930f2c08e093e62b4f5bf7
parentd641958f658833b5866ea80861f9ff8eb1519bec
parentaaea3938b5637ffb1d77e8b7707c207b24e02937
Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Regression fix for Fermi acceleration, and fixes important to bringing
up display-less Maxwell boards.

* 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/gr/gm204: remove a stray printk
  drm/nouveau/devinit/gm100-: force devinit table execution on boards without PDISP
  drm/nouveau/devinit/gf100: make the force-post condition more obvious
  drm/nouveau/gr/gf100-: fix wrong constant definition