Merge "msm: display: use the fb reserved fields same as kernel 3.0" into msm-3.4