Merge with Linus' 2.6 tree