Merge with Linus' kernel.