diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-05-08 11:36:40 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-05-08 11:36:40 -0400 |
commit | 0d770a82ad8a46b12d706cf11cd11e274fe92302 (patch) | |
tree | 27447232a00683077b5495029d868176a63a0706 /drivers/net/wireless/ath/ath9k | |
parent | d294d0286af8afbb714e046a7cb9caa4c44fe133 (diff) | |
parent | 017a64161f6d082f6e3ed85646217bd7217af15a (diff) |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
0 files changed, 0 insertions, 0 deletions