mirror of https://gitee.com/openkylin/linux.git
32efe08d77
Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c Small minor conflict in bnx2x, wherein one commit changed how statistics were stored in software, and another commit fixed endianness bugs wrt. reading the values provided by the chip in memory. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| chain_mode.c | ||
| common.h | ||
| descs.h | ||
| descs_com.h | ||
| dwmac100.h | ||
| dwmac100_core.c | ||
| dwmac100_dma.c | ||
| dwmac1000.h | ||
| dwmac1000_core.c | ||
| dwmac1000_dma.c | ||
| dwmac_dma.h | ||
| dwmac_lib.c | ||
| enh_desc.c | ||
| mmc.h | ||
| mmc_core.c | ||
| norm_desc.c | ||
| ring_mode.c | ||
| stmmac.h | ||
| stmmac_ethtool.c | ||
| stmmac_main.c | ||
| stmmac_mdio.c | ||
| stmmac_pci.c | ||
| stmmac_platform.c | ||
| stmmac_timer.c | ||
| stmmac_timer.h | ||