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: a5f601f 3deca9d)

author	Wolfgang Denk <wd@denx.de>
	Mon, 26 Nov 2007 21:57:53 +0000 (22:57 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Mon, 26 Nov 2007 21:57:53 +0000 (22:57 +0100)
commit	88fed9a120aabd6e0b684e2616cafca58aaa7f93
tree	610ea8a2bbc3dbfb7e661fbdbce7fb5af5375d50	tree \| snapshot
parent	a5f601fd1b1278deae5aa9fc27a232b0d1c1c788	commit \| diff
parent	3deca9d44767efd1b83f4b701f0dbf21a7595f7b	commit \| diff

Merge commit '3deca9d'

Conflicts:

Makefile

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

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