Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/dvm/tx.c
	drivers/net/wireless/ti/wlcore/sdio.c
	drivers/net/wireless/ti/wlcore/spi.c

1 files changed, 0 insertions, 2 deletions

diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c
index 1f6f01e2dc4c..238ee49b3868 100644
--- a/net/wireless/sysfs.c
+++ b/net/wireless/sysfs.c
@@ -106,9 +106,7 @@ static int wiphy_resume(struct device *dev)
         int ret = 0;
 
         /* Age scan results with time spent in suspend */
-        spin_lock_bh(&rdev->bss_lock);
         cfg80211_bss_age(rdev, get_seconds() - rdev->suspend_at);
-        spin_unlock_bh(&rdev->bss_lock);
 
         if (rdev->ops->resume) {
                 rtnl_lock();