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: cd514ae f68ab43)

author	Wolfgang Denk <wd@denx.de>
	Sat, 5 Dec 2009 01:11:59 +0000 (02:11 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Sat, 5 Dec 2009 01:11:59 +0000 (02:11 +0100)
commit	2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70
tree	e19b3def6c8f41f56cdb5e8b71aa53d8f72f5812	tree \| snapshot
parent	cd514aeb996e2f7aefbe1f78481965d9d074aed4	commit \| diff
parent	f68ab43de67f59925542efb6bcec30f4a84fe695	commit \| diff

Merge branch 'master' into next

Conflicts:
board/esd/plu405/plu405.c
drivers/rtc/ftrtc010.c

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
board/esd/plu405/plu405.c	diff1 \|	diff2 \|	blob \| history
common/Makefile	diff1 \|	diff2 \|	blob \| history
common/cmd_bootm.c	diff1 \|	diff2 \|	blob \| history
include/configs/PLU405.h	diff1 \|	diff2 \|	blob \| history
include/image.h	diff1 \|	diff2 \|	blob \| history
lib_generic/Makefile	diff1 \|	diff2 \|	blob \| history
mkconfig	diff1 \|	diff2 \|	blob \| history

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