]> git.sur5r.net Git - u-boot/commit
Merge branch 'master' of git://www.denx.de/git/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Thu, 27 Dec 2007 00:12:56 +0000 (01:12 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 27 Dec 2007 00:12:56 +0000 (01:12 +0100)
commit81b38be8631a0b809c97ab3d929f491373d7314f
tree0dd6444e2b602dcd06524f57c234b1f3b18ceb83
parentf77ac3d657e9b1d40012153e872a2118cca10a3d
parent29592ecba3b932b9b152bcec6c0c0806412db4a3
Merge branch 'master' of git://www.denx.de/git/u-boot-sh

Conflicts:

MAINTAINERS

Signed-off-by: Wolfgang Denk <wd@denx.de>
MAINTAINERS
MAKEALL
Makefile