]> git.sur5r.net Git - u-boot/commit
Merge branch 'master' into next
authorWolfgang Denk <wd@denx.de>
Sat, 5 Dec 2009 01:11:59 +0000 (02:11 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 5 Dec 2009 01:11:59 +0000 (02:11 +0100)
commit2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70
treee19b3def6c8f41f56cdb5e8b71aa53d8f72f5812
parentcd514aeb996e2f7aefbe1f78481965d9d074aed4
parentf68ab43de67f59925542efb6bcec30f4a84fe695
Merge branch 'master' into next

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

Signed-off-by: Wolfgang Denk <wd@denx.de>
MAINTAINERS
board/esd/plu405/plu405.c
common/Makefile
common/cmd_bootm.c
include/configs/PLU405.h
include/image.h
lib_generic/Makefile
mkconfig