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

diff --cc arch/arm/cpu/armv7/highbank/timer.c
Simple merge

diff --cc arch/arm/include/asm/arch-armv7/systimer.h
Simple merge

diff --cc arch/arm/lib/board.c
Simple merge

diff --cc board/altera/socfpga/Makefile
Simple merge

diff --cc board/altera/socfpga/socfpga_cyclone5.c
Simple merge

diff --cc board/highbank/highbank.c
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc drivers/net/calxedaxgmac.c
Simple merge

diff --cc include/configs/highbank.h
Simple merge