diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-24 14:31:35 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-24 14:31:35 (GMT) |
| commit | 40253dd12a64086885097d253b665c9876635e76 (patch) | |
| tree | ab93904ec84b33c1e9336baa8eae710dd957683f /disk | |
| parent | 8182b41994f0b1824c31652d64171ffa596517fc (diff) | |
| parent | e662573822d24dcdc079d29ff397cb8bacf97b27 (diff) | |
| download | u-boot-40253dd12a64086885097d253b665c9876635e76.tar.xz | |
Merge git://git.denx.de/u-boot-socfpga
Conflicts:
include/configs/axs101.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'disk')
0 files changed, 0 insertions, 0 deletions