Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 1 Aug 2013 19:26:52 +0000 (15:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 1 Aug 2013 19:26:52 +0000 (15:26 -0400)
commit7546ff95499781306e8fd7d84ae38b84be961364
tree58416d00380ad1122acee71b594b26ab9a201e48
parent2cdf359a521bb72286b6714478dfdbcd2691f3fe
parentc82b5a74cc739385db6e4275fe504a0e9469bf01
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/mwifiex/cfg80211.c
net/mac80211/cfg.c
net/mac80211/rc80211_minstrel.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c
net/wireless/nl80211.c