Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 16 Jan 2014 17:54:17 +0000 (12:54 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 16 Jan 2014 17:54:17 +0000 (12:54 -0500)
commit2b755bbd8198161416ce24e3358817d8ede93037
tree7b04bc63c08adb384a1fd4eb118f364c56aa4dab
parent608cfbe4abaf76e9d732efd7ed1cfa3998163d91
parentcf38e4f756d6396657c76f72ef42b6f47c523f97
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/dvm/ucode.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/rs.c