| commit | d5068656bd856eb97d6bb7b27de3d0ca8d8dda78 | [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 | 92dda87b91c96bf11723ef58dbd11bfa29adb6cc [diff] | |
| parent | 87b3d4b019a7440483a6a4b4b689c50bd53116a4 [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