Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 10 Mar 2011 22:26:00 +0000 (14:26 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Mar 2011 22:26:00 +0000 (14:26 -0800)
commit33175d84ee3fa29991adb80513683e010769e807
tree3731f61cf82451b6892cf1368701e57e35d92908
parentc5908939b2738bafe1b309bc2465cb9f2e6184c5
parent6dfbd87a20a737641ef228230c77f4262434fa24
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/bnx2x/bnx2x_cmn.c
17 files changed:
MAINTAINERS
drivers/net/bnx2x/bnx2x.h
drivers/net/bnx2x/bnx2x_cmn.c
drivers/net/bnx2x/bnx2x_cmn.h
drivers/net/bnx2x/bnx2x_ethtool.c
drivers/net/bnx2x/bnx2x_main.c
drivers/net/macvtap.c
include/linux/netdevice.h
net/core/dev.c
net/core/pktgen.c
net/ipv4/devinet.c
net/ipv4/ip_gre.c
net/ipv4/ipip.c
net/ipv6/ip6_tunnel.c
net/ipv6/route.c
net/ipv6/sit.c
net/unix/af_unix.c