| commit | 4376c0e00aedcddd063e70b4c202ea83f7fb80ec | [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 | e37e0ed01fb31ed033a0a3e22b700a6ba351e746 [diff] | |
| parent | 544a9e43a2b7b3e191c72e50ce56902236cfc800 [diff] |
Merge git://git.denx.de/u-boot-socfpga Conflicts: include/configs/axs101.h Signed-off-by: Tom Rini <trini@konsulko.com>