diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-03 15:34:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-03 15:34:41 -0500 |
| commit | c3c5bb31ea046721bc5fe3e54b45c7a13677f398 (patch) | |
| tree | e924df7c6d1834e2fd5079d5c424c0a3f070f490 /drivers/net/wireless/iwlwifi/mvm/sta.c | |
| parent | 55d1cad2efe2e3567c3116f50ba10e5af1bc01fc (diff) | |
| parent | 14648d6534477952633ee3ecadb31cf227414f13 (diff) | |
| download | linux-c3c5bb31ea046721bc5fe3e54b45c7a13677f398.tar.gz linux-c3c5bb31ea046721bc5fe3e54b45c7a13677f398.tar.bz2 linux-c3c5bb31ea046721bc5fe3e54b45c7a13677f398.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/sta.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c index 0a8af2083ddc..ec1812133235 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/iwlwifi/mvm/sta.c @@ -5,7 +5,7 @@ * * GPL LICENSE SUMMARY * - * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved. + * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of version 2 of the GNU General Public License as @@ -30,7 +30,7 @@ * * BSD LICENSE * - * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved. + * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |