]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'msm-fixes-3.17-rc4' of git://people.freedesktop.org/~robclark/linux...
authorDave Airlie <airlied@redhat.com>
Thu, 11 Sep 2014 10:52:43 +0000 (20:52 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 11 Sep 2014 10:52:43 +0000 (20:52 +1000)
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


Trivial merge