Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/ath/ath9k/main.c net/bluetooth/hci_event.c
Showing
想要评论请 注册 或 登录
Conflicts: drivers/net/wireless/ath/ath9k/main.c net/bluetooth/hci_event.c