author | Wolfgang Denk <wd@denx.de> | |
Fri, 25 Apr 2008 09:32:01 +0000 (11:32 +0200) | ||
committer | Wolfgang Denk <wd@denx.de> | |
Fri, 25 Apr 2008 09:32:01 +0000 (11:32 +0200) | ||
commit | 4b7a6dd89633d60dc4b58476d5ce48247f82a3ca | |
tree | d3cfeccec77867d855289809d6a472617d16c0cc | tree | snapshot (tar.xz tar.gz zip) |
parent | 926662762e5d280f6a9caed8dd9f49be2ebcaf2f | commit | diff |
parent | a6e6fc610e39dec41b79680413d4ed38145bd3c8 | commit | 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>
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 |