diff --git a/[refs] b/[refs]
index 464adc2e1540..6560fa1bea74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bba52d5e9ecd0a1705fbac93b6d50ef6ec475315
+refs/heads/master: b2b9b6518eac7b4e9abf649ef4273c02f1a5276b
diff --git a/trunk/net/ieee80211/softmac/ieee80211softmac_module.c b/trunk/net/ieee80211/softmac/ieee80211softmac_module.c
index ea4a19e1122c..a5699966fbc5 100644
--- a/trunk/net/ieee80211/softmac/ieee80211softmac_module.c
+++ b/trunk/net/ieee80211/softmac/ieee80211softmac_module.c
@@ -77,7 +77,7 @@ ieee80211softmac_clear_pending_work(struct ieee80211softmac_device *sm)
 	spin_unlock_irqrestore(&sm->lock, flags);
 	flush_scheduled_work();
 
-	// now we should be save and no longer need locking...
+	/* now we should be save and no longer need locking... */
 	spin_lock_irqsave(&sm->lock, flags);
 	/* Free all pending auth work items */
 	list_for_each_entry_safe(authptr, authtmp, &sm->auth_queue, list) {
diff --git a/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c b/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c
index 1a1eda434cfd..30e79d45af6b 100644
--- a/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c
+++ b/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c
@@ -84,7 +84,6 @@ void ieee80211softmac_scan(void *d)
 
 		if (!invalid_channel) {
 			sm->set_channel(sm->dev, si->channels[current_channel_idx].channel);
-			//TODO: Probe the channel
 			// FIXME make this user configurable (active/passive)
 			if(ieee80211softmac_send_mgt_frame(sm, NULL, IEEE80211_STYPE_PROBE_REQ, 0))
 				printkl(KERN_DEBUG PFX "Sending Probe Request Failed\n");