Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Tue, 30 Dec 2014 12:04:09 +0000 (13:04 +0100)
committerStefano Babic <sbabic@denx.de>
Tue, 30 Dec 2014 12:04:38 +0000 (13:04 +0100)
commit4e0114d9679173cfe8bfaffb8b4fb4bbf8cdaa10
tree2a909fd0434753a0e5b252afcda5aeb23f21ac26
parent7ae350a0305de592faa8903255c988d4e6afb194
parent125738e819a3b9d15210794b3dcef9f4d9bcf866
Merge branch 'master' of git://git.denx.de/u-boot

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