net-2.6 merged with upstream

I merged Linus's tree into net-2.6 in order to deal with
some conflicts.

I intend to make a push to Linus later tonight or early Friday
morning.

Patch acceptance will get progressively stricter, and you should
be looking at fixing bugs being reported at this point anyways.
:-)