diff options
author | roy zang <tie-fei.zang@freescale.com> | 2006-12-01 12:09:33 +0800 |
---|---|---|
committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2006-12-01 12:09:33 +0800 |
commit | e0b369e4f71b11dd5716903dd6258028cf07e6e8 (patch) | |
tree | 615986f2b3088072c49d74e1086650e185087698 /CREDITS | |
parent | ee311214e0d216f904feea269599d0934bf71f23 (diff) | |
parent | dd520bf314c7add4183c5191692180f576f96b60 (diff) | |
download | blackbird-obmc-uboot-e0b369e4f71b11dd5716903dd6258028cf07e6e8.tar.gz blackbird-obmc-uboot-e0b369e4f71b11dd5716903dd6258028cf07e6e8.zip |
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
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -465,3 +465,8 @@ N: James MacAulay E: james.macaulay@amirix.com D: Suppport for Amirix AP1000 W: www.amirix.com + +N: Timur Tabi +E: timur@freescale.com +D: Support for MPC8349E-mITX +W: www.freescale.com |