Merge ../linux-2.6-x86