| commit | 40253dd12a64086885097d253b665c9876635e76 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Thu Dec 24 09:31:35 2015 -0500 |
| committer | Tom Rini <trini@konsulko.com> | Thu Dec 24 09:31:35 2015 -0500 |
| tree | ab93904ec84b33c1e9336baa8eae710dd957683f | |
| parent | 8182b41994f0b1824c31652d64171ffa596517fc [diff] | |
| parent | e662573822d24dcdc079d29ff397cb8bacf97b27 [diff] |
Merge git://git.denx.de/u-boot-socfpga Conflicts: include/configs/axs101.h Signed-off-by: Tom Rini <trini@konsulko.com>