Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/8139too.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_main.c
index 98604350a811be1d45e92ed2c3889ba28eabbed5,74be989f51c5fff1157e8eeba5438eb13003b6f1..5b4a8f34b13c3529d0d92241b1b3d3bdf54d77f0
--- 1/drivers/net/bnx2x/bnx2x_main.c
--- 2/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@@ -50,7 -49,9 +50,8 @@@
  #include <linux/zlib.h>
  #include <linux/io.h>
  #include <linux/stringify.h>
+ #include <linux/vmalloc.h>
  
 -#define BNX2X_MAIN
  #include "bnx2x.h"
  #include "bnx2x_init.h"
  #include "bnx2x_init_ops.h"

diff --cc drivers/net/can/Kconfig
Simple merge

diff --cc drivers/net/greth.c
Simple merge

diff --cc drivers/net/qlge/qlge.h
Simple merge

diff --cc drivers/net/qlge/qlge_main.c
Simple merge

diff --cc drivers/net/r8169.c
Simple merge

diff --cc drivers/net/rionet.c
Simple merge

diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
Simple merge

diff --cc drivers/net/vmxnet3/vmxnet3_int.h
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/8021q/vlan_dev.c
Simple merge

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/sunrpc/auth_gss/auth_gss.c
Simple merge

diff --cc net/sunrpc/clnt.c
Simple merge