Merge Linus' tree.