| commit | 4b7a6dd89633d60dc4b58476d5ce48247f82a3ca | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Fri Apr 25 11:32:01 2008 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Fri Apr 25 11:32:01 2008 +0200 |
| tree | d3cfeccec77867d855289809d6a472617d16c0cc | |
| parent | 926662762e5d280f6a9caed8dd9f49be2ebcaf2f [diff] | |
| parent | a6e6fc610e39dec41b79680413d4ed38145bd3c8 [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>