]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit411bae4415956c4e0ad6fa6efc98d9564f07f3b7
tree59b471d8b38ca2a271fcde02f8f049e390ef485b
parent642daf3b9b69a4f5a76a8901643bedb77ed2526c
parente885f38a159c33225fcfcb0af0e8f18c2d5dbe22
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