Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 21:13:24 +0000 (13:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 21:13:24 +0000 (13:13 -0800)
commit5403c8a29521a6eb02f9283dbbe0184527f8f42b
tree4f1ca17feda4dfa88f53eceeaa39583ec840d27e
parentc79b9e4936142d5ed26073d58bdd4a5a0ac62f32
parentc4c93106741bbf61ecd05a2a835af8e3bf31c1bd
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
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