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)
1  2 
include/configs/zynq-common.h

Simple merge