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> |
||
|---|---|---|
| .. | ||
| altera_msgdma.c | ||
| altera_msgdma.h | ||
| altera_msgdmahw.h | ||
| altera_sgdma.c | ||
| altera_sgdma.h | ||
| altera_sgdmahw.h | ||
| altera_tse_ethtool.c | ||
| altera_tse_main.c | ||
| altera_tse.h | ||
| altera_utils.c | ||
| altera_utils.h | ||
| Kconfig | ||
| Makefile | ||