Files
kernel_google_msm-4.14/include/linux/mmc
Wilson Sung 882a4df121 Merge LA.UM.8.1.C9.09.00.00.518.107 via branch 'qcom-msm-4.14' into android-msm-floral-4.14
Conflicts:
	Documentation/devicetree/bindings/regulator/qpnp-amoled-regulator.txt
	drivers/irqchip/irq-gic.c
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_soc.c
	drivers/mfd/qcom-spmi-pmic.c
	drivers/power/supply/power_supply_sysfs.c
	drivers/regulator/qpnp-amoled-regulator.c
	drivers/scsi/ufs/ufs-debugfs.c
	include/linux/power_supply.h
	mm/filemap.c

Bug: 129559122
Change-Id: Ie9e66d4de54e3795da7cd153ba832f4749d4effc
Signed-Off-By: Andrew Chant <achant@google.com>
2019-04-06 22:28:07 +00:00
..