Merge ../torvalds-2.6/