Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 11 Apr 2011 20:44:25 +0000 (13:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Apr 2011 20:44:25 +0000 (13:44 -0700)
commit1c01a80cfec6f806246f31ff2680cd3639b30e67
tree0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c
parentc44d79950b2daa1025e62eede73e4e4a274d1ef3
parent4a9f65f6304a00f6473e83b19c1e83caa1e42530
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/smsc911x.c
40 files changed:
drivers/isdn/mISDN/layer2.c
drivers/net/atl1e/atl1e_main.c
drivers/net/atlx/atl2.c
drivers/net/bcm63xx_enet.c
drivers/net/benet/be_cmds.c
drivers/net/benet/be_main.c
drivers/net/bnx2x/bnx2x_hsi.h
drivers/net/bnx2x/bnx2x_main.c
drivers/net/cris/eth_v10.c
drivers/net/cxgb4vf/cxgb4vf_main.c
drivers/net/gianfar.h
drivers/net/ibmlana.c
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c
drivers/net/pcnet32.c
drivers/net/s2io.c
drivers/net/s2io.h
drivers/net/sfc/net_driver.h
drivers/net/skge.h
drivers/net/sky2.c
drivers/net/smsc911x.c
drivers/net/stmmac/stmmac_main.c
drivers/net/sungem.c
drivers/net/tg3.c
drivers/net/tg3.h
drivers/net/usb/smsc95xx.c
drivers/net/via-rhine.c
drivers/net/via-velocity.c
include/linux/ethtool.h
include/linux/pkt_sched.h
include/net/sock.h
net/bridge/br_fdb.c
net/bridge/br_ioctl.c
net/core/dev.c
net/ipv4/fib_trie.c
net/ipv4/ip_output.c
net/ipv4/raw.c
net/ipv4/route.c
net/ipv4/udp.c
net/socket.c