Merge "defconfig: 8960:  Enable tz_log platform device driver" into msm-3.0