diff --git a/[refs] b/[refs] index 923fd2d43447..aa772a259d49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a469ebd56f8bee8d5352b1a284ea39d23ba02430 +refs/heads/master: 3f865490698871bf77eebce05208fd08e9b45aeb diff --git a/trunk/net/mac80211/work.c b/trunk/net/mac80211/work.c index 2accea37742e..6c53b6d1002b 100644 --- a/trunk/net/mac80211/work.c +++ b/trunk/net/mac80211/work.c @@ -1094,7 +1094,7 @@ static void ieee80211_work_work(struct work_struct *work) local->tmp_channel = NULL; /* If tmp_channel wasn't operating channel, then * we need to go back on-channel. - * NOTE: If we can ever be here while scanning, + * NOTE: If we can ever be here while scannning, * or if the hw_config() channel config logic changes, * then we may need to do a more thorough check to see if * we still need to do a hardware config. Currently,