| commit | e0b369e4f71b11dd5716903dd6258028cf07e6e8 | [log] [tgz] |
|---|---|---|
| author | roy zang <tie-fei.zang@freescale.com> | Fri Dec 01 12:09:33 2006 +0800 |
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | Fri Dec 01 12:09:33 2006 +0800 |
| tree | 615986f2b3088072c49d74e1086650e185087698 | |
| parent | ee311214e0d216f904feea269599d0934bf71f23 [diff] | |
| parent | dd520bf314c7add4183c5191692180f576f96b60 [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