Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 4 Feb 2012 21:39:32 +0000 (16:39 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 4 Feb 2012 21:39:32 +0000 (16:39 -0500)
commitdd48dc34fe7639a8b2e22d8b609672f5f81aa7cb
treef16ace0ae09edab16bf6d0be9e8280dfbb7100da
parent8d9eb069eafce49307f839783e4a4673414b1fd5
parent5962b35c1de3254a2f03b95efd3b7854b874d7b7
Merge git://git./linux/kernel/git/davem/net
13 files changed:
MAINTAINERS
drivers/net/ethernet/emulex/benet/be_ethtool.c
drivers/net/ethernet/freescale/fec.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/ti/davinci_emac.c
drivers/net/xen-netfront.c
include/net/tcp.h
net/caif/caif_socket.c
net/ipv4/ip_gre.c
net/ipv4/tcp_output.c