]> git.sur5r.net Git - u-boot/commit
Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Wed, 16 Jul 2014 06:51:30 +0000 (08:51 +0200)
committerStefano Babic <sbabic@denx.de>
Wed, 16 Jul 2014 06:51:30 +0000 (08:51 +0200)
commitdab5e3469d294a4e1ffed8407d296a78e02cc01f
treec6378034591210b3142ca3add806d52c6ea22b3b
parent14a1613140519a8d0a88e6054c302a8cb3e067a5
parent524123a70761110c5cf3ccc5f52f6d4da071b959
Merge branch 'master' of git://git.denx.de/u-boot

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