Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Sun, 28 Aug 2016 14:36:20 +0000 (10:36 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 28 Aug 2016 14:36:20 +0000 (10:36 -0400)
1  2 
include/configs/uniphier.h

Simple merge