From: Dave Airlie <airlied@redhat.com>
Date: Thu, 11 Sep 2014 10:52:43 +0000 (+1000)
Subject: Merge branch 'msm-fixes-3.17-rc4' of git://people.freedesktop.org/~robclark/linux... 
X-Git-Tag: MMI-PSA29.97-13-9~11557^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d9f4acd0b46159452d946b20b0ac633b0343a81e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'msm-fixes-3.17-rc4' of git://people.freedesktop.org/~robclark/linux into drm-fixes

A couple more little fixes:
 1) fix from llvm/clang folks
 2) fix build if common clock framework is not used
 3) if vram carveout is used, have default size for vram carveout

* 'msm-fixes-3.17-rc4' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: don't crash if no msm.vram param
  drm/msm/hdmi: fix build break on non-CCF platforms
  drm/msm: Change nested function to static function
---

d9f4acd0b46159452d946b20b0ac633b0343a81e