git.dujemihanovic.xyz Git - u-boot.git/commit

]> git.dujemihanovic.xyz Git - u-boot.git/commit

projects / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 14a1613 524123a)

author	Stefano Babic <sbabic@denx.de>
	Wed, 16 Jul 2014 06:51:30 +0000 (08:51 +0200)
committer	Stefano Babic <sbabic@denx.de>
	Wed, 16 Jul 2014 06:51:30 +0000 (08:51 +0200)
commit	dab5e3469d294a4e1ffed8407d296a78e02cc01f
tree	c6378034591210b3142ca3add806d52c6ea22b3b	tree \| snapshot
parent	14a1613140519a8d0a88e6054c302a8cb3e067a5	commit \| diff
parent	524123a70761110c5cf3ccc5f52f6d4da071b959	commit \| diff

Merge branch 'master' of git://git.denx.de/u-boot

Signed-off-by: Stefano Babic <sbabic@denx.de>
Conflicts:
boards.cfg

My U-Boot fork