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: ac8192a 1ddda1b)

author	Tom Rini <trini@ti.com>
	Wed, 14 Jan 2015 16:00:38 +0000 (11:00 -0500)
committer	Tom Rini <trini@ti.com>
	Wed, 14 Jan 2015 16:00:38 +0000 (11:00 -0500)
commit	bd5053ffa5b8162257537bdb79ba829372423096
tree	c2bc3a310b096b7cbd2394e6d184e1a380fe1f65	tree \| snapshot
parent	ac8192a5877c35735bb95a36e196b2c100c67827	commit \| diff
parent	1ddda1b321a102b31bcddc0b1cc23fe3449533c6	commit \| diff

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

Conflicts:
tools/buildman/control.py

Signed-off-by: Tom Rini <trini@ti.com>

My U-Boot fork