Skip to content
GitLab
Explore
Sign in
Commit
40253dd1
authored
Dec 24, 2015
by
Tom Rini
Browse files
Merge
git://git.denx.de/u-boot-socfpga
Conflicts: include/configs/axs101.h Signed-off-by:
Tom Rini
<
trini@konsulko.com
>
parents
8182b419
e6625738
Loading
Loading
Loading
Changes
28
Show whitespace changes
Inline
Side-by-side
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment