No, he rebased it - the three commits you shared are now separate ones.
Most of the conflicts seem to have been due tot he x86 tree changes
though. But it seems I didn't mess up too much: at least the result booted
for me without complaints. So I pushed out my resolution.
Jesse, can you please double-check it?
Linus
--