| commit | 2f1a4cee21ebee21f09a523c2fd2b09350eb8317 | [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 | fa65a4aec268b631d0b863b5d220d2f6dbeed5a7 [diff] | |
| parent | 635a2c701d2d8c0d6d72d085af9df1d85955742b [diff] |
Merge git://www.denx.de/git/u-boot Conflicts: board/tqm5200/tqm5200.c