Merge to-linus-stable into to-akpm