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

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

author	David S. Miller <davem@davemloft.net>
	Tue, 22 Jul 2014 07:44:59 +0000 (00:44 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 22 Jul 2014 07:44:59 +0000 (00:44 -0700)
commit	9a9ca836763d5dc131df4dde6a25b8c221db84d8
tree	1490343b5ad9f88b9333e53fa9457c00cbf6c2d1	tree \| snapshot
parent	abe0b59341b87fce16480a317edf016e1750c252	commit \| diff
parent	6271e9b0a0b03e7f296f8049a9aee45f290d56d9	commit \| diff

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

Conflicts:
drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

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

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/cxgb4/cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/cxgb4/device.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/cxgb4/iw_cxgb4.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/x25_asy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/netback.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history