commit b5d9c1ef42b853435bfe144a1f7bc66773816bb7
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 3445065dc2597fe24e70d746746cb6a20989284e
parent 474dbb8cbde2492285ce9c7598519d6b11bcfb4e

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>