net-2.6 and net-2.6.26 merged

As I eluded to in a reply I just made to John Linville
wrt. wireless merging, I did a lot of upstream
pulling into my trees.

I pulled Linus's current tree into net-2.6

Next, I pulled net-2.6 into the net-2.6.26 tree and
resolved all conflicts.  I did an "allmodconfig" build
on sparc64 and that went without any build errors.