mainline lk.lnx.1.0 HEAD Commit:

commit 7de805be
Author: Anmolpreet Kaur <anmolpre@codeaurora.org>
Date:   Thu Feb 21 17:58:18 2019 +0530

    platform: msm_shared: add api to check NAND devices

    platform_boot_dev_is_nand is an api to check if device
    is a NAND based target.

lk.lnx.1.0.1 HEAD Commit:
commit 7f5e6c01
Merge: a4170090 fbb1f3dd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 5 01:52:10 2019 -0800

    Merge "[8996-lk]: Enable ENABLE_FBCON_DISPLAY_MSG in LK for AVB2.0 Support"

Conflicts:
	platform/msm8996/include/platform/iomap.h
	target/msm8996/init.c

Change-Id: I5bfcb07b51768436465d1fe10ad6b16ee0f9cb8e
Signed-off-by: Richard JK <rjk@codeaurora.org>