mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
![]() Conflicts: drivers/net/ethernet/marvell/mvneta.c The mvneta.c conflict is a case of overlapping changes, a conversion to devm_ioremap_resource() vs. a conversion to netdev_alloc_pcpu_stats. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
vlan.c | ||
vlan.h | ||
vlan_core.c | ||
vlan_dev.c | ||
vlan_gvrp.c | ||
vlan_mvrp.c | ||
vlan_netlink.c | ||
vlanproc.c | ||
vlanproc.h |