Merge remote-tracking branch 'remotes/gfiber-internal/vendor_drops' into merge2
Conflicts:
arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvLib.c
arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.h
arch/arm/mach-feroceon-kw2/kw2_family/cpu/mvCpu.c
arch/arm/mach-feroceon-kw2/sysmap.c
arch/arm/plat-feroceon/mv_drivers_lsp/mv_pon/core/epon/eponOnuIsr.c
arch/arm/plat-feroceon/mv_drivers_lsp/mv_pon/plat/ponOnuBoard.c
arch/arm/plat-feroceon/mv_drivers_lsp/mv_pon/plat/ponOnuBoard.h
arch/arm/plat-feroceon/mv_drivers_lsp/mv_tpm/core/tpm_init.c
Change-Id: I05dd1583e129989d259d9cd72814c5454040a576
