| commit | 278087fd6d3d4b2218815083d3a825dd2b43fe46 | [log] [tgz] |
|---|---|---|
| author | roy zang <tie-fei.zang@freescale.com> | Wed Nov 29 09:45:03 2006 +0800 |
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | Wed Nov 29 09:45:03 2006 +0800 |
| tree | e450a5f1e69a78a203a1e15167d7fefa43c5ce7e | |
| parent | a6f58c1660f258aac739bcad0b2807d9fd0f88e1 [diff] | |
| parent | 1b711ab250bb96403a794ea184040af3ccba907e [diff] |
Solve the copyright conflicts when merging 'master' into hpc2. Merge branch 'master' into hpc2 Conflicts: drivers/cfi_flash.c