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
..
Kconfig	net: ethernet: rocker: Add dependency to CONFIG_BRIDGE in Kconfig	2014-12-09 15:26:43 -05:00
Makefile
rocker.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
rocker.h	rocker: rename lport to pport	2015-02-26 11:21:57 -05:00