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: 7cfc12a 41be969)

author	Stefan Roese <sr@denx.de>
	Tue, 11 Dec 2007 10:34:54 +0000 (11:34 +0100)
committer	Stefan Roese <sr@denx.de>
	Tue, 11 Dec 2007 10:34:54 +0000 (11:34 +0100)
commit	9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105
tree	1afcc9c20c04e19870ab5e2996104877695c54a3	tree \| snapshot
parent	7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b	commit \| diff
parent	41be969f4957115ed7b1fe8b890bfaee99d7a7a2	commit \| diff

Merge commit 'u-boot/master' into for-1.3.1

Conflicts:

drivers/rtc/Makefile

MAKEALL	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/ds1775.c	\|	diff2 \|	blob \| history
drivers/rtc/Makefile	\|	diff2 \|	blob \| history
include/common.h	diff1 \|	diff2 \|	blob \| history
nand_spl/board/amcc/acadia/Makefile	diff1 \|	diff2 \|	blob \| history

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