| commit | 00b574bdc8c54dbc9e03f63c24f62955d483e3ef | [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 | 30bddf2c46ab2e824f217a38db033118ac4622af [diff] | |
| parent | ccbc7036648e465697ca298ba51e0e76dda352a0 [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>