Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Tue, 23 Feb 2016 13:13:46 +0000 (08:13 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 23 Feb 2016 13:13:46 +0000 (08:13 -0500)
commitb625fab7069cab52fd8e0c3dbb25e0d04d020173
tree13d5c94c6c36724136264a4c3b9764583eace1c4
parentbed6bd326e89366152609821a752d361b2183b46
parent674f3609aad39f099a5c3605643a6be124504b96
Merge branch 'master' of git://git.denx.de/u-boot-spi
include/configs/zynq-common.h