linux 2.6.18 merge adjustments

Following will be a set of patches that adjust 2.6.18 merges we had done differently in our internal tree, and that I think shouldn't get lost. There should be no particular ordering among them, so if any seems questionable, others should still be applicable.

Jan