diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-06 15:35:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-06 15:35:14 -0500 |
| commit | 59d74026fa4b5df72a268f1e9578af500154ad07 (patch) | |
| tree | 4b6058de06d70c5080a63178475708a686954c84 /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | |
| parent | a0417fa3a18a14be1f4d9cffcf378a7c42d92a91 (diff) | |
| parent | 8926574c4d0055ca4c4a02d1f6b2c249d01a0621 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
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 1c665941662..8ca9570ec36 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 - 2011 Intel Corporation. All rights reserved. + * Copyright(c) 2003 - 2012 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 |