merge changes from: https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git



Signed-off-by: Robert Nelson <robertcnelson@gmail.com>