OK, I cleaned up your patches and applied the following to my for-2.6.18 tree. I think all of my changes were fixes and/or cleanups, but you may want to check that I didn't break anything -- I'm sending the 5 patches I ended up with to the list. - R.