merge from linus/linux master