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: f93f219 1899fac)

author	Stefano Babic <sbabic@denx.de>
	Mon, 11 Aug 2014 08:21:03 +0000 (10:21 +0200)
committer	Stefano Babic <sbabic@denx.de>
	Mon, 11 Aug 2014 08:21:03 +0000 (10:21 +0200)
commit	e82abaeb7f2a0833fccf90460c48b9f2100258f8
tree	de701f5c90b7373966412d566b5c00d3837954bc	tree \| snapshot
parent	f93f21906e374d46c6abfbdf4eb9cb1ab51b6384	commit \| diff
parent	1899fac925eda817e12234aef3d01d354788662e	commit \| diff

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

Conflicts:
boards.cfg

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

README	diff1 \|	diff2 \|	blob \| history
include/configs/m53evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx31pdk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mxs.h	diff1 \|	diff2 \|	blob \| history

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