git.cascardo.eti.br Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8d9eb06 5962b35)

author	David S. Miller <davem@davemloft.net>
	Sat, 4 Feb 2012 21:39:32 +0000 (16:39 -0500)
committer	David S. Miller <davem@davemloft.net>
	Sat, 4 Feb 2012 21:39:32 +0000 (16:39 -0500)
commit	dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb
tree	f16ace0ae09edab16bf6d0be9e8280dfbb7100da	tree \| snapshot
parent	8d9eb069eafce49307f839783e4a4673414b1fd5	commit \| diff
parent	5962b35c1de3254a2f03b95efd3b7854b874d7b7	commit \| diff

Merge git://git./linux/kernel/git/davem/net

13 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/caif/caif_socket.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.