Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Feb 2014 20:05:42 +0000 (15:05 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Feb 2014 20:05:42 +0000 (15:05 -0500)
commit0971f7d991f051b4f146e61363ee855adc9b31c2
treee825711effd11b63bccadaabb4df6d5be2698de3
parentdb18014f65f62879e70be55898be3fd68a3363a8
parent82b715c211a53e80a1db83b9b71995a05fe32908
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/scan.c
drivers/net/wireless/iwlwifi/mvm/tx.c
drivers/net/wireless/iwlwifi/mvm/utils.c