fdt_generic_devices: rebase fail

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>