git.maquefel.me Git - linux.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	f6a1ad4295f9291038380178d09978caf6982dd8
tree	7c35e8efe1812baca9c6b9674be1ee02a0495ec3	tree \| snapshot
parent	036dafa28da1e2565a8529de2ae663c37b7a0060	commit \| diff
parent	f3969bf78f140f437f51787dfc2751943ba454d1	commit \| diff

Merge git://git./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>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

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