David S. Miller 8fd90bb889 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>		2014-07-22 00:44:59 -07:00
..
core	Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next	2014-06-10 10:12:14 -07:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-22 00:44:59 -07:00
ulp	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
Kconfig	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
Makefile	IB: Allow build of hw/ and ulp/ subdirectories independently	2014-06-02 14:51:12 -07:00