-
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirelessJohn W. Linville authored
Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirelessJohn W. Linville authoredConflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c