Sync up with mainline to get device tree and other changes.