Merge "msm_fb: Add backlight support using both GPIO 96 and PWM" into msm-3.4