Merge ../linux-2.6 by hand