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

Makefile

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

arch/arm/cpu/armv7/socfpga/Makefile

arch/arm/cpu/armv7/socfpga/clock_manager.c

arch/arm/cpu/armv7/socfpga/fpga_manager.c

arch/arm/cpu/armv7/socfpga/misc.c

arch/arm/cpu/armv7/socfpga/reset_manager.c

arch/arm/cpu/armv7/socfpga/spl.c

arch/arm/cpu/armv7/socfpga/system_manager.c

arch/arm/cpu/armv7/socfpga/timer.c

arch/arm/include/asm/arch-keystone/clock_defs.h

arch/arm/include/asm/arch-socfpga/clock_manager.h

arch/arm/include/asm/arch-socfpga/fpga_manager.h

arch/arm/include/asm/arch-socfpga/nic301.h

arch/arm/include/asm/arch-socfpga/reset_manager.h

arch/arm/include/asm/arch-socfpga/scu.h

arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h

arch/arm/include/asm/arch-socfpga/system_manager.h

arch/arm/include/asm/system.h

arch/arm/lib/cache-cp15.c