wifi: fixed some derps

Signed-off-by: Dan Trifan <jimsth@gmail.com>
wireless backport from 3.4

Courtesy of Brian Beloshapka (bbelos)

Change-Id: I4b0a8d591bfe57c9f69943ecaf2fa80e772fde8e
Signed-off-by: Dan Trifan <jimsth@gmail.com>

Conflicts:
	include/linux/ieee80211.h
	include/linux/module.h
	include/linux/nl80211.h
	include/net/cfg80211.h
	lib/genalloc.c
	net/wireless/mlme.c
	net/wireless/nl80211.c
	net/wireless/nl80211.h