Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 6 Jul 2011 06:23:37 +0000 (23:23 -0700)]
21 files changed:
1  2 
MAINTAINERS
drivers/net/8139too.c
drivers/net/Kconfig
drivers/net/bnx2x/bnx2x_main.c
drivers/net/can/Kconfig
drivers/net/greth.c
drivers/net/qlge/qlge.h
drivers/net/qlge/qlge_main.c
drivers/net/r8169.c
drivers/net/rionet.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/vmxnet3/vmxnet3_int.h
include/linux/pci_ids.h
include/net/sock.h
net/8021q/vlan_dev.c
net/ipv4/af_inet.c
net/ipv4/ip_output.c
net/ipv4/udp.c
net/ipv6/route.c
net/sunrpc/auth_gss/auth_gss.c
net/sunrpc/clnt.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
@@@ -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"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
Simple merge
Simple merge
Simple merge