tree 83be374c478ed85ab90da323b3a51c20736a737d
parent 505dcd201a047d2bb25d083bbf101a281812efca
parent 02bf5b8d8f3d72809dada7b7633c20312417759e
author Tom Rini <trini@konsulko.com> 1474565695 -0400
committer Tom Rini <trini@konsulko.com> 1474565695 -0400

Merge branch 'master' of git://git.denx.de/u-boot-uniphier