Files
kernel_google_redbull/include/uapi
lucaswei 19587463dd Merge branch 'LA.UM.8.13.R1.08.00.00.571.029' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	drivers/power/supply/power_supply_sysfs.c
	drivers/power/supply/qcom/qpnp-smb5.c
	drivers/power/supply/qcom/smb5-lib.h
	drivers/scsi/ufs/ufs.h
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd.h
	drivers/tty/serial/msm_geni_serial.c
	fs/pstore/inode.c
	include/linux/msm_drm_notify.h
	include/linux/power_supply.h
	include/uapi/scsi/ufs/ufs.h

Bug: 144659331
Bug: 144685052
Change-Id: I00d543204bba9d0a839611102b82ef556a60cf75
Signed-off-by: lucaswei <lucaswei@google.com>
2020-05-30 01:49:07 +08:00
..
2019-10-01 14:32:14 -07:00