Merge with ../linux-2.6-smp