Merge branch 'linux-4.0' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into...
authorDave Airlie <airlied@redhat.com>
Tue, 17 Mar 2015 00:54:24 +0000 (10:54 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 17 Mar 2015 00:54:24 +0000 (10:54 +1000)
commit59caeaee377248feeba9cb9057eb1e85ac2abb8b
treea29bf7b757bd0ca854b591e108fab37ffaf06293
parent06e5801b8cb3fc057d88cb4dc03c0b64b2744cda
parent5a6f690ca565f536ab0fc05e267b08d5a7c36b46
Merge branch 'linux-4.0' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

nouveau fixes, and gm206 modesetting enables.

* 'linux-4.0' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/bios: fix i2c table parsing for dcb 4.1
  drm/nouveau/device/gm100: Basic GM206 bring up (as copy of GM204)
  drm/nouveau/device: post write to NV_PMC_BOOT_1 when flipping endian switch
  drm/nouveau/gr/gf100: fix some accidental or'ing of buffer addresses
  drm/nouveau/fifo/nv04: remove the loop from the interrupt handler