git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Tue, 6 Mar 2012 02:16:26 +0000 (21:16 -0500)
committer	David S. Miller <davem@davemloft.net>
	Tue, 6 Mar 2012 02:16:26 +0000 (21:16 -0500)
commit	eb71b291799b3b9d06e5fc60bb917aa1a6fe80d2
tree	7c35e8efe1812baca9c6b9674be1ee02a0495ec3	tree \| snapshot
parent	00653efbabb108bce5de8ae068834d28d0142c95	commit \| diff
parent	e085e50e1cbc7cf4a3650a9de7f9c2d64e36c805	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/vmxnet3/vmxnet3_drv.c

Small vmxnet3 conflict with header size bug fix in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qla3xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history