diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-12 16:16:02 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-12 16:16:02 -0700 |
commit | a7e70158884629898d79709622a66b8ef99e4018 (patch) | |
tree | bd0cd03816f85f5bcef84000e01b0f9701f063ed /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | |
parent | 24743537d3f784a8b3014e934fad0a9c45e4e789 (diff) | |
parent | 252f4bf400df1712408fe83ba199a66a1b57ab1d (diff) |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rxon.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index dfdbea6e8f99..c335ee6883ee 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright(c) 2003 - 2010 Intel Corporation. All rights reserved. + * Copyright(c) 2003 - 2011 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 |