David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
netxen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
qlcnic	qlcnic: Fix trivial typo in comment	2015-03-01 13:40:22 -05:00
qlge	ethernet: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
Kconfig	qlcnic: Fix Kconfig dependency on HWMON	2014-05-07 17:23:25 -04:00
Makefile
qla3xxx.c	qla3xxx: don't allow never end busy loop	2015-01-06 17:41:36 -05:00
qla3xxx.h