Merge branch 'u-boot/master' into u-boot-arm/master
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 25 Jul 2013 15:57:46 +0000 (17:57 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 25 Jul 2013 15:57:46 +0000 (17:57 +0200)
1  2 
arch/arm/cpu/armv7/highbank/timer.c
arch/arm/include/asm/arch-armv7/systimer.h
arch/arm/lib/board.c
board/altera/socfpga/Makefile
board/altera/socfpga/socfpga_cyclone5.c
board/highbank/highbank.c
boards.cfg
drivers/net/calxedaxgmac.c
include/configs/highbank.h

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc boards.cfg
Simple merge
Simple merge
Simple merge