| commit | afa98843e4665add11b69496341053b268156e3a | [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 | b440d0ef72e6278973d3220c10136a4c0624c286 [diff] | |
| parent | aeec782b020930732eab075af97212c3f03afcae [diff] |
Merge branch 'master' of http://www.denx.de/git/u-boot Conflicts: board/stxxtc/Makefile