projects / oweals / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9266627 a6e6fc6)
Merge branch 'master' of /home/wd/git/u-boot/lwmon5
authorWolfgang Denk <wd@denx.de>
Fri, 25 Apr 2008 09:32:01 +0000 (11:32 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 25 Apr 2008 09:32:01 +0000 (11:32 +0200)
commit4b7a6dd89633d60dc4b58476d5ce48247f82a3ca
treed3cfeccec77867d855289809d6a472617d16c0cctree | snapshot
parent926662762e5d280f6a9caed8dd9f49be2ebcaf2fcommit | diff
parenta6e6fc610e39dec41b79680413d4ed38145bd3c8commit | diff
Merge branch 'master' of /home/wd/git/u-boot/lwmon5

Conflicts:

common/cmd_bootm.c
common/cmd_log.c
include/common.h
post/board/lwmon5/Makefile
post/board/lwmon5/dsp.c
post/board/lwmon5/dspic.c
post/board/lwmon5/fpga.c
post/board/lwmon5/gdc.c
post/board/lwmon5/sysmon.c
post/board/lwmon5/watchdog.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
Makefile diff1 | diff2 | blob | history
common/cmd_mem.c diff1 | diff2 | blob | history
include/asm-ppc/global_data.h diff1 | diff2 | blob | history
include/common.h diff1 | diff2 | blob | history
include/configs/lwmon5.h diff1 | diff2 | blob | history
post/board/lwmon5/watchdog.c diff1 | diff2 | blob | history
post/drivers/rtc.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.