Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Dec 2013 20:09:58 +0000 (15:09 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Dec 2013 20:09:58 +0000 (15:09 -0500)
commit623c43875f496fdd3fc0e6288bd0e06aa2b63c9d
tree8479dcd1a8f8f294de0d90a6e96f0ca9741f2383
parent204e35a91c4b3327b7239d7687fbd4923edbbf08
parentcf4ef65446443eb485afe9419ea82b2efbe582a7
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