]> git.sur5r.net Git - u-boot/commitdiff
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)
Conflicts:
board/esd/plu405/plu405.c
drivers/rtc/ftrtc010.c

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

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc common/Makefile
Simple merge
Simple merge
Simple merge
diff --cc include/image.h
Simple merge
Simple merge
diff --cc mkconfig
Simple merge