Merge remote-tracking branch 'wireless-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Thu, 28 Jun 2012 11:45:58 +0000 (13:45 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 28 Jun 2012 11:45:58 +0000 (13:45 +0200)
commitb1fbd46976d047a6d6767872a9112afaa914fd82
tree59b471d8b38ca2a271fcde02f8f049e390ef485b
parentbf0c111ec80355ee9fe2e2bdb609a536b54768d8
parentbf52592fe4901f486a5266fd73e4ee80205b18b4
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ti/wlcore/main.c
include/net/mac80211.h
net/mac80211/cfg.c
net/mac80211/mlme.c