Files
Wilson Sung e79686e302 Merge android-msm-floral-4.14 into android-msm-pixel-4.14
Conflicts:
	drivers/gpu/drm/msm/dsi-staging/dsi_panel.h
	drivers/hwtracing/coresight/Makefile
	drivers/hwtracing/coresight/coresight-etm-perf.c
	drivers/hwtracing/coresight/coresight-funnel.c
	drivers/hwtracing/coresight/coresight.c
	drivers/power/supply/google/google_battery.c
	drivers/scsi/ufs/ufs.h
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd.h
	fs/f2fs/file.c
	fs/incfs/format.c
	kernel/sched/fair.c

Bug: 149536833
Change-Id: I1d4d215d793dd2f3ee1655393cdf2d253ff75342
Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-04-30 12:15:11 +08:00
..