]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0bd951138fcfa00f1962703a4ad9ced7533706fa
treed3118b3bc1c752b0ae3304353501291deb069719
parentff548154b22e4a40d04126060005fb3f30d79849
parent303d077333de7a13ad64ed776b70c28ff33029a3
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