]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Mon, 11 Aug 2014 08:21:03 +0000 (10:21 +0200)
committerStefano Babic <sbabic@denx.de>
Mon, 11 Aug 2014 08:21:03 +0000 (10:21 +0200)
Conflicts:
boards.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>
1  2 
README
include/configs/m53evk.h
include/configs/mx31pdk.h
include/configs/mxs.h

diff --cc README
Simple merge
Simple merge
Simple merge
Simple merge