]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jun 2012 18:27:34 +0000 (14:27 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jun 2012 18:27:34 +0000 (14:27 -0400)
commit2c443443e715fc79da9b7c3e4f31a71fcf315b09
tree5b73cea04b13c888d94e29000c0a66ed2c23980f
parent5ea276963eacbef742fe4854883c0f69c903fcfd
parent371a255e863857f988a91a3850d6feeaa4f3c536
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
drivers/net/wireless/mac80211_hwsim.c
include/net/mac80211.h
net/mac80211/cfg.c
net/mac80211/mlme.c