-
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirelessJohn W. Linville authored
Conflicts: drivers/net/wireless/mwifiex/cfg80211.c
ab3d59d2
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
Conflicts: drivers/net/wireless/mwifiex/cfg80211.c