Partial 2.6.32 merge of drivers/net (non-compiling)