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)
commit8b485ba12b0defa0c4ed3559789250238f8331a8
treea1174810bef0d504370272918dca8d485ae2ae3b
parent12607adcd5181a8f6eab885a5fe4ba2fa12ef92a
parentaaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c
Merge branch 'u-boot/master' into u-boot-arm/master
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