git.sur5r.net Git - u-boot/commit

]> git.sur5r.net Git - u-boot/commit

projects / u-boot / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fc25fa2 2072e72)

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)
commit	4180b3dba25c2c28cc4502f1c9f1cbad2a9972b8
tree	ce2ac59e3f933e6c7f220edf3b14a2e46174ef14	tree \| snapshot
parent	fc25fa27e5f439705e9ca42182014e2d75d9f0ae	commit \| diff
parent	2072e7262965bb48d7fffb1e283101e6ed8b21a8	commit \| diff

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

README	diff1 \|	diff2 \|	blob \| history
common/cmd_bootm.c	diff1 \|	diff2 \|	blob \| history
common/image.c	diff1 \|	diff2 \|	blob \| history
include/configs/omap3_beagle.h	diff1 \|	diff2 \|	blob \| history
include/image.h	diff1 \|	diff2 \|	blob \| history

Cloned from git://git.denx.de/u-boot.git