Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> merge xloader Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>