diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-06 23:26:39 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 23:26:39 +0400 |
| commit | 8926574c4d0055ca4c4a02d1f6b2c249d01a0621 (patch) | |
| tree | 0c02c3cfff77e868d605246204add4664503b2af /drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |
| parent | c056b734e54e12f38f34a2583a4824e6cecc16c1 (diff) | |
| parent | b0302aba812bcc39291cdab9ad7e37008f352a91 (diff) | |
| download | linux-8926574c4d0055ca4c4a02d1f6b2c249d01a0621.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 64cf439035c3..a8f7689aaacf 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c @@ -2,7 +2,7 @@ * * GPL LICENSE SUMMARY * - * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved. + * Copyright(c) 2008 - 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 |