Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>
132 files changed