| commit | 3938a0fa4e142645ffffd2654a419cf3b0f799f1 | [log] [tgz] |
|---|---|---|
| author | Jon Loeliger <jdl@freescale.com> | Tue Sep 19 08:51:24 2006 -0500 |
| committer | Jon Loeliger <jdl@freescale.com> | Tue Sep 19 08:51:24 2006 -0500 |
| tree | 116878b6b94920a5f282d0a16e4b9ad9dfaf57ff | |
| parent | 99c2dc2b015a2a5b81316aff6f228fb392a13c7a [diff] | |
| parent | 573a3ad503cfc854b636c378bffc87bbbf7a6aef [diff] |
Merge branch 'master' of http://www.denx.de/git/u-boot Conflicts: board/stxxtc/Makefile