Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 3 Jan 2014 20:34:41 +0000 (15:34 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 3 Jan 2014 20:34:41 +0000 (15:34 -0500)
commitc3c5bb31ea046721bc5fe3e54b45c7a13677f398
treee924df7c6d1834e2fd5079d5c424c0a3f070f490
parent55d1cad2efe2e3567c3116f50ba10e5af1bc01fc
parent14648d6534477952633ee3ecadb31cf227414f13
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/sta.c