diff --git a/[refs] b/[refs]
index ad6cdb1e7c28..75b5d2f407dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0efcdfd6ed4e7ac74c45e7c3218fd1a7416fdb3f
+refs/heads/master: 137f9f46a4edf8a937ffe9e3dba498b5cfaa1e5b
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index f80dc2535709..563ceb4d2252 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2009,6 +2009,10 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata,
 	if (ieee80211_sta_active_ibss(sdata))
 		return;
 
+	if ((sdata->u.sta.flags & IEEE80211_STA_BSSID_SET) &&
+	    (!(sdata->u.sta.flags & IEEE80211_STA_AUTO_CHANNEL_SEL)))
+		return;
+
 	printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "
 	       "IBSS networks with same SSID (merge)\n", sdata->dev->name);
 	ieee80211_request_scan(sdata, ifsta->ssid, ifsta->ssid_len);