Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Aug 2013 17:51:40 +0000 (13:51 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Aug 2013 17:51:40 +0000 (13:51 -0400)
commitf3e979a52c554f45e4ca6f01ca6933acef34b872
tree53aa9e61aa7fd0c225528fba4144b2d15f709ad9
parentcd80e107b741f9e05c53a01e5cbe2cdf4b6074bc
parenta98655387762394371b88cdfb8215884757978ab
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/ath/wil6210/wmi.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c
net/wireless/nl80211.c