Merge from Linus' tree.