Merge upstream common device-tree