]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5423c79ffc436a9655ae46a50771d94ce75accfd
tree8479dcd1a8f8f294de0d90a6e96f0ca9741f2383
parent59bf5724edc04a27c8efbf6a9ad6fec5b5a96f0a
parentb8c94da0bbbb13532d1f11d165c8ffe6af6e8576
Merge branch 'for-john' of git://git.kernel.org/pub/scm/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