Merge remote-tracking branch 'u-boot/master' into test

author Marek Vasut <marex@denx.de>

Wed, 14 May 2014 22:20:54 +0000 (00:20 +0200)

committer Marek Vasut <marex@denx.de>

Wed, 14 May 2014 22:20:54 +0000 (00:20 +0200)
author Marek Vasut <marex@denx.de>
Wed, 14 May 2014 22:20:54 +0000 (00:20 +0200)
committer Marek Vasut <marex@denx.de>
Wed, 14 May 2014 22:20:54 +0000 (00:20 +0200)
diff --cc README
Simple merge
diff --cc common/cmd_bootm.c
Simple merge
diff --cc common/image.c
Simple merge
diff --cc include/configs/omap3_beagle.h
Simple merge
diff --cc include/image.h
Simple merge
author	Marek Vasut <marex@denx.de>
	Wed, 14 May 2014 22:20:54 +0000 (00:20 +0200)
committer	Marek Vasut <marex@denx.de>
	Wed, 14 May 2014 22:20:54 +0000 (00:20 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
common/cmd_bootm.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/image.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/omap3_beagle.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/image.h	patch \|	diff1 \|	diff2 \|	blob \| history