David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-14 01:01:12 -05:00
..
cxgb3i	libcxgbi/cxgb4i : Fix ipv6 build failure caught with randconfig	2014-08-13 20:04:47 -07:00
cxgb4i	cxgb4i/cxgb4 : Refactor macros to conform to uniform standards	2014-11-13 14:36:22 -05:00
Kconfig	[SCSI] cxgb3i: change cxgb3i to use libcxgbi	2010-09-05 14:29:23 -03:00
libcxgbi.c	libcxgbi : support ipv6 address host_param	2014-10-28 09:57:00 +01:00
libcxgbi.h	libcxgbi : support ipv6 address host_param	2014-10-28 09:57:00 +01:00
Makefile	[SCSI] cxgb3i: change cxgb3i to use libcxgbi	2010-09-05 14:29:23 -03:00