Jindong
b78139f806
Merge remote-tracking branch 'aosp/android-4.14-p-release' into imx_4.14.y_android
Conflicts:
Makefile
arch/arc/Makefile
arch/arm64/configs/defconfig
arch/arm64/mm/init.c
drivers/android/binder_alloc.c
drivers/base/power/main.c
drivers/md/dm-linear.c
drivers/mmc/core/core.c
drivers/mmc/core/host.c
drivers/thermal/hisi_thermal.c
fs/f2fs/data.c
fs/f2fs/inode.c
fs/f2fs/segment.c
fs/f2fs/segment.h
fs/squashfs/file.c
fs/squashfs/file_cache.c
fs/squashfs/file_direct.c
fs/squashfs/squashfs.h
fs/ubifs/dir.c
include/linux/arm-smccc.h
include/linux/compiler-clang.h
kernel/debug/kdb/kdb_io.c
kernel/sched/cpufreq_schedutil.c
Change-Id: I2f2dc3fa4f0ad890ffc4b2104e8f8f00352c0646