Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c
Showing
Please register or sign in to comment
Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c