mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 15:12:04 +00:00
e0b369e4f7
The conflicts due to a new mpc7448 p3m7448 board is in the main tree. Merge branch 'master' into hpc2 Conflicts: MAKEALL cpu/74xx_7xx/cpu.c cpu/74xx_7xx/cpu_init.c cpu/74xx_7xx/speed.c |
||
---|---|---|
.. | ||
bat_rw.c | ||
board.c | ||
cache.c | ||
extable.c | ||
interrupts.c | ||
kgdb.c | ||
Makefile | ||
ppcstring.S | ||
ticks.S | ||
time.c |