Wolfgang Denk 4b7a6dd896 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>

2008-04-25 11:32:01 +02:00

..

i2c.c

POST: preparations for moving CONFIG_POST to Makefiles

2008-04-22 14:38:38 +02:00

Makefile

POST: move CONFIG_POST to Makefiles

2008-04-22 14:40:19 +02:00

memory.c

POST: preparations for moving CONFIG_POST to Makefiles

2008-04-22 14:38:38 +02:00

rtc.c

Merge branch 'master' of /home/wd/git/u-boot/lwmon5

2008-04-25 11:32:01 +02:00