mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 07:31:29 +00:00
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> |
||
|---|---|---|
| .. | ||
| ixp4xx_eth.c | ||
| Kconfig | ||
| Makefile | ||