tree 2a909fd0434753a0e5b252afcda5aeb23f21ac26
parent 7ae350a0305de592faa8903255c988d4e6afb194
parent 125738e819a3b9d15210794b3dcef9f4d9bcf866
author Stefano Babic <sbabic@denx.de> 1419941049 +0100
committer Stefano Babic <sbabic@denx.de> 1419941078 +0100

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

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