Updates from  torvalds/master