From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Nov 2015 04:37:28 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: submit/tizen/20160607.132125~1406
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae36ce07abbdde3521dc0ef7e32143b88718cd21;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Two build fixes, one for VC4, one for nouveau where the ARM only code
  is doing something a bit strange.  While people are discussing that,
  just workaround it and fix the build for now.  The code in question
  will never get used on anything non-ARM anyways.

  Also one fix for AST that SuSE had been hiding in their kernel, that
  allows all fbdev apps to work on that driver"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: fix build failures on all non ARM.
  drm/ast: Initialized data needed to map fbdev memory
  drm/vc4: Add dependency on HAVE_DMA_ATTRS, and select DRM_GEM_CMA_HELPER
---

ae36ce07abbdde3521dc0ef7e32143b88718cd21