git.openpandora.org
/
pandora-u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Solve the copyright conflicts when merging 'master' into hpc2.
[pandora-u-boot.git]
/
MAKEALL
diff --git
a/MAKEALL
b/MAKEALL
index
84a708a
..
5aad6e7
100755
(executable)
--- a/
MAKEALL
+++ b/
MAKEALL
@@
-150,8
+150,8
@@
LIST_85xx=" \
#########################################################################
LIST_74xx=" \
- DB64360 DB64460 EVB64260
P3G4
\
- P
CIPPC2 PCIPPC6 ZUMA
\
+ DB64360 DB64460 EVB64260
mpc7448hpc2
\
+ P
3G4 PCIPPC2 PCIPPC6 ZUMA
\
"
LIST_7xx=" \