tree d3118b3bc1c752b0ae3304353501291deb069719
parent 3afdd8a0e26dfa8c4c67bef56d89fe53ed425f3d
parent 3a10ba8c6b68d9b7f519cd25f903be2d43b37d9d
author Dave Airlie <airlied@redhat.com> 1410432763 +1000
committer Dave Airlie <airlied@redhat.com> 1410432763 +1000

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