Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

arch/arm/cpu/armv7/am33xx/Makefile

arch/arm/cpu/armv7/am33xx/mem.c

arch/arm/cpu/armv7/am33xx/sys_info.c

arch/arm/cpu/armv7/omap-common/Makefile

arch/arm/cpu/armv7/omap-common/emif-common.c

arch/arm/cpu/armv7/omap-common/hwinit-common.c

arch/arm/cpu/armv7/omap-common/mem-common.c

arch/arm/cpu/armv7/omap3/Makefile

arch/arm/cpu/armv7/omap5/hw_data.c

arch/arm/cpu/armv7/omap5/hwinit.c

arch/arm/cpu/armv7/omap5/prcm-regs.c

arch/arm/cpu/armv7/omap5/sdram.c

arch/arm/include/asm/arch-am33xx/sys_proto.h

arch/arm/include/asm/arch-omap3/mem.h

arch/arm/include/asm/arch-omap4/cpu.h

arch/arm/include/asm/arch-omap4/hardware.h

arch/arm/include/asm/arch-omap4/mem.h

arch/arm/include/asm/arch-omap4/omap.h

arch/arm/include/asm/arch-omap4/sys_proto.h

arch/arm/include/asm/arch-omap5/cpu.h