Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 29 May 2013 18:50:45 +0000 (14:50 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 29 May 2013 18:50:45 +0000 (14:50 -0400)
commit531efffc3e3ff52d732c8fa6f32e084e9c447612
tree79c301b2c8b5400a39c95e034764cf7a208a16a2
parentbbf71a8f35cf52e97ba129401f82ccefd249c757
parentb571a69745dc90aec3d0505a7ceac2702a93861b
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/cmdevt.c
drivers/net/wireless/mwifiex/main.c