net-2.6 merged into net-next-2.6

I just did a merge, it was mostly clean except for some
wireless bits (some -next work conflicted with the recent
"use_new_eeprom_foo" changes in iwlwifi).

John please take a quick look and see if I made any mistakes.

Thanks.