Albert ARIBAUD 6d4511b2c6 Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master' ... Conflicts: arch/arm/include/asm/arch-zynq/hardware.h The conflict above was trivial and solved during merge.		2013-09-03 14:01:02 +02:00
..
board.c	Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'	2013-09-03 14:01:02 +02:00
Makefile	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00