From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 30 Jan 2012 20:28:11 +0000 (-0500)
Subject: Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID."
X-Git-Tag: v3.4-rc1~177^2~376^2^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c037b8367c7e2b775a99d74037f5df014d2fbf06;p=pandora-kernel.git

Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID."

This reverts commit f1e3be1561c43b6bbe2426e34849fb1486dc313b.

Johannes Berg <johannes@sipsolutions.net> thinks that this patch is
incorrect.  I'll defer to his judgment.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed