forked from Minki/linux
71a83a6db6
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> |
||
---|---|---|
.. | ||
common.h | ||
interface.c | ||
Makefile | ||
netback.c | ||
xenbus.c |