projects / oweals / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f93f219 1899fac)
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 patch | diff1 | diff2 | blob | history
include/configs/m53evk.h patch | diff1 | diff2 | blob | history
include/configs/mx31pdk.h patch | diff1 | diff2 | blob | history
include/configs/mxs.h patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
diff --cc include/configs/m53evk.h
Simple merge
diff --cc include/configs/mx31pdk.h
Simple merge
diff --cc include/configs/mxs.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.