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)
1  2 
drivers/net/wireless/ath/wil6210/wmi.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c
net/wireless/nl80211.c

Simple merge
Simple merge
Simple merge