]> git.sur5r.net Git - u-boot/commit
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)
commite82abaeb7f2a0833fccf90460c48b9f2100258f8
treede701f5c90b7373966412d566b5c00d3837954bc
parentf93f21906e374d46c6abfbdf4eb9cb1ab51b6384
parent1899fac925eda817e12234aef3d01d354788662e
Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
boards.cfg

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