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)
Signed-off-by: Stefano Babic <sbabic@denx.de>

Trivial merge