merge to latest version (torvalds)