Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Oct 2011 22:18:09 +0000 (18:18 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Oct 2011 22:18:09 +0000 (18:18 -0400)
commit1805b2f04855f07afe3a71d620a68f483b0ed74f
treeb823b90f37f5404fcaef70f785c70112ca74a329
parent78d81d15b74246c7cedf84894434890b33da3907
parentf42af6c486aa5ca6ee62800cb45c5b252020509d
Merge branch 'master' of ra./linux/kernel/git/davem/net
21 files changed:
MAINTAINERS
arch/mips/Kconfig
drivers/net/bonding/bond_main.c
drivers/net/can/mscan/mscan.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/jme.c
drivers/net/ethernet/mellanox/mlx4/en_tx.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/ethernet/smsc/smsc911x.c
drivers/net/ppp/pptp.c
include/linux/skbuff.h
kernel/sys.c
net/batman-adv/translation-table.c
net/bridge/br_if.c
net/bridge/br_private.h
net/core/dev.c
net/core/fib_rules.c
net/ipv4/route.c
net/ipv4/tcp_minisocks.c