Merge 2.4 patches to 2.6 kernel.