-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller authored
Minor comment conflict in mac80211. Signed-off-by: David S. Miller <davem@davemloft.net>
f0b59897
Minor comment conflict in mac80211.
Signed-off-by: David S. Miller <davem@davemloft.net>