diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-03-16 18:45:25 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-16 18:45:25 +0100 |
| commit | 01a282980937f9ca55a3cb06b9c6ff1cc49ea396 (patch) | |
| tree | 07a043edc861e245a7a9764751af0898a1f1199a /drivers/net/wireless/ath/ath6kl/testmode.c | |
| parent | cdc_ncm: avoid discarding datagrams in rx path (diff) | |
| parent | libertas: remove dump_survey implementation (diff) | |
| download | linux-01a282980937f9ca55a3cb06b9c6ff1cc49ea396.tar.xz linux-01a282980937f9ca55a3cb06b9c6ff1cc49ea396.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/hw.c
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/testmode.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/testmode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/testmode.c b/drivers/net/wireless/ath/ath6kl/testmode.c index f0cd61d6188a..6675c92b542b 100644 --- a/drivers/net/wireless/ath/ath6kl/testmode.c +++ b/drivers/net/wireless/ath/ath6kl/testmode.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2010-2011 Atheros Communications Inc. + * Copyright (c) 2011 Qualcomm Atheros, Inc. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above |