projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3afdd8a 3a10ba8)
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)
commitd9f4acd0b46159452d946b20b0ac633b0343a81e
treed3118b3bc1c752b0ae3304353501291deb069719tree | snapshot (tar.gz zip)
parent3afdd8a0e26dfa8c4c67bef56d89fe53ed425f3dcommit | diff
parent3a10ba8c6b68d9b7f519cd25f903be2d43b37d9dcommit | diff
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
Motorola kernel-slsi