Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Sat, 4 Feb 2012 21:39:32 +0000 (16:39 -0500)]
13 files changed:
1  2 
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

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge