Merge "ARM: cache-l2x0.c: consistently use u32" into msm-3.0