• D
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · efd0bf97
    David S. Miller 提交于
    The forcedeth changes had a conflict with the conversion over
    to atomic u64 statistics in net-next.
    
    The libertas cfg.c code had a conflict with the bss reference
    counting fix by John Linville in net-next.
    
    Conflicts:
    	drivers/net/ethernet/nvidia/forcedeth.c
    	drivers/net/wireless/libertas/cfg.c
    efd0bf97
MAINTAINERS 201.6 KB
反馈
建议
客服 返回
顶部