Merge "msm: board-8960: Fix overflow in memory calc." into msm-3.0