From: Dave Airlie <airlied@redhat.com>
Date: Tue, 17 Mar 2015 00:54:24 +0000 (+1000)
Subject: Merge branch 'linux-4.0' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=59caeaee377248feeba9cb9057eb1e85ac2abb8b;p=linux-beck.git

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
---

59caeaee377248feeba9cb9057eb1e85ac2abb8b