tree c676e6d3847b50f44f87afab50dc125fae6f1b84
parent dc8107c2567368cec3197f10c437f3a29d630730
parent 47edb14b1d4d880fd4d39e81420ec0a73f00be9f
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1378209662 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1378209662 +0200

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.