Robin Peng
252284b7f7
Merge LA.UM.9.12.R1.10.00.00.597.022 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
arch/arm64/configs/vendor/lito_defconfig
block/blk-merge.c
drivers/acpi/scan.c
drivers/soc/qcom/minidump_log.c
drivers/mmc/core/queue.c
drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
drivers/power/supply/power_supply_sysfs.c
drivers/power/supply/qcom/qpnp-smb5.c
drivers/power/supply/qcom/smb5-lib.c
drivers/power/supply/qcom/smb5-lib.h
drivers/scsi/ufs/ufs.h
drivers/scsi/ufs/ufshcd.c
drivers/staging/android/ion/ion_secure_util.c
drivers/thermal/qcom/Makefile
drivers/thermal/qcom/adc-tm5.c
fs/f2fs/data.c
fs/f2fs/super.c
include/linux/power_supply.h
include/linux/qcom-geni-se.h
Bug: 150587879
Bug: 150587495
Bug: 149799837
Bug: 150109764
Change-Id: Ib20ed28d481cee37153148328427e40c32252a5b
Signed-off-by: Robin Peng <robinpeng@google.com>
2020-05-30 02:15:03 +08:00
..
2019-11-05 16:04:08 -08:00
2019-11-05 16:04:08 -08:00
2019-06-21 10:04:03 -07:00
2020-05-30 01:51:41 +08:00
2019-01-28 12:41:20 -07:00
2020-05-30 02:15:03 +08:00
2019-10-10 17:50:50 -07:00
2019-01-28 13:30:40 -08:00
2019-11-05 16:04:08 -08:00
2019-11-05 16:04:08 -08:00
2019-11-05 16:04:08 -08:00
2019-11-05 16:04:08 -08:00