| commit | 4b9dd45b6cd2c3cfb135893ab8230ffe6695e295 | [log] [tgz] |
|---|---|---|
| author | roy zang <tie-fei.zang@freescale.com> | Wed Feb 28 16:46:48 2007 +0800 |
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | Wed Feb 28 16:46:48 2007 +0800 |
| tree | dc49c4219bafd43c2ace6c5a3e6745d7b7264194 | |
| parent | fd9120e40c0a286dc0452c08c4a0d391d43c7ebf [diff] | |
| parent | aefd623dc9113926e789a88f03a85e783666f5e6 [diff] |
Merge branch 'master' into hpc2 Conflicts: drivers/Makefile Fix the merge conflict in file drivers/Makefile Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>