| commit | 6a40ef62c4300e9f606deef0a4618cbc4b514a51 | [log] [tgz] |
|---|---|---|
| author | Markus Klotzbuecher <mk@denx.de> | Wed Jan 09 13:57:10 2008 +0100 |
| committer | Markus Klotzbuecher <mk@denx.de> | Wed Jan 09 13:57:10 2008 +0100 |
| tree | c01bdd0e773d092f13af05567fa92fb9072df9e0 | |
| parent | 245a362ad3c0c1b84fccc9fec7b623eb14f6e502 [diff] | |
| parent | 07eb02687f008721974a2fb54cd7fdc28033ab3c [diff] |
Merge git://www.denx.de/git/u-boot Conflicts: board/tqm5200/tqm5200.c