Merge commit 'u-boot-fdt/testing'