Merge with Linus' current tree