]> git.sur5r.net Git - u-boot/commit
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ee31121 dd520bf)
Fix the confilcts when merging 'master' into hpc2.
authorroy zang <tie-fei.zang@freescale.com>
Fri, 1 Dec 2006 04:09:33 +0000 (12:09 +0800)
committerZang Tiefei <roy@bus.ap.freescale.net>
Fri, 1 Dec 2006 04:09:33 +0000 (12:09 +0800)
commite0b369e4f71b11dd5716903dd6258028cf07e6e8
tree615986f2b3088072c49d74e1086650e185087698tree | snapshot
parentee311214e0d216f904feea269599d0934bf71f23commit | diff
parentdd520bf314c7add4183c5191692180f576f96b60commit | diff
Fix the confilcts when merging 'master' into hpc2.
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
MAKEALL diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
README diff1 | diff2 | blob | history
cpu/74xx_7xx/cpu.c diff1 | diff2 | blob | history
include/74xx_7xx.h diff1 | diff2 | blob | history
include/asm-ppc/global_data.h diff1 | diff2 | blob | history
net/eth.c diff1 | diff2 | blob | history
Cloned from git://git.denx.de/u-boot.git