u-boot-brain/arch/arm/include/asm/arch-zynq
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
..
hardware.h Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master' 2013-09-03 14:01:02 +02:00
sys_proto.h zynq: Add new ddrc driver for ECC support 2013-08-12 08:59:55 +02:00