This patch is roughly the same as the Sep05 patch, except that it is intended
to be applied against a 2.0.31-pre-10 kernel.  It applies cleanly and leaves
out the changes that were implemented in the main stream kernel between
pre-7 and pre-10 (to avoid conflicts).  Where the changes were implemented
in both the Sep05 patch and in the pre-10 kernel, the pre-10 kernel's changes
took seniority and were used instead of the Sep05 code.