Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c net/mac80211/ibss.c
Showing
想要评论请 注册 或 登录
从无法访问的项目Fork
Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c net/mac80211/ibss.c