Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 31 Jan 2011 21:13:24 +0000 (13:13 -0800)]
1  2 
drivers/net/bnx2x/bnx2x.h
drivers/net/bnx2x/bnx2x_main.c
include/net/sock.h
net/core/dev.c
net/core/rtnetlink.c
net/ipv4/af_inet.c

Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge