tree 011d14cb0af189d4156b4f72cd4e84d10a5c5a1d
parent 57448a7382732271bd0fe312853233956e7e7700
parent 66bb725b99056aa4a715b4d118bbd37fb82fcef4
author John Newlin <jnewlin@google.com> 1370038672 -0700
committer John Newlin <jnewlin@google.com> 1370040346 -0700

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