git.sur5r.net Git - u-boot/commit

]> git.sur5r.net Git - u-boot/commit

projects / u-boot / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f77ac3d 29592ec)

author	Wolfgang Denk <wd@denx.de>
	Thu, 27 Dec 2007 00:12:56 +0000 (01:12 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Thu, 27 Dec 2007 00:12:56 +0000 (01:12 +0100)
commit	81b38be8631a0b809c97ab3d929f491373d7314f
tree	0dd6444e2b602dcd06524f57c234b1f3b18ceb83	tree \| snapshot
parent	f77ac3d657e9b1d40012153e872a2118cca10a3d	commit \| diff
parent	29592ecba3b932b9b152bcec6c0c0806412db4a3	commit \| diff

Merge branch 'master' of git://www.denx.de/git/u-boot-sh

Conflicts:

MAINTAINERS

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
MAKEALL	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history

Cloned from git://git.denx.de/u-boot.git