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-wifi.h | |
| 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-wifi.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-wifi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-wifi.h b/drivers/net/wireless/iwlwifi/iwl-wifi.h index 18501101a530..7e6eb20823cf 100644 --- a/drivers/net/wireless/iwlwifi/iwl-wifi.h +++ b/drivers/net/wireless/iwlwifi/iwl-wifi.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * GPL LICENSE SUMMARY | 6 | * GPL LICENSE SUMMARY |
| 7 | * | 7 | * |
| 8 | * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved. | 8 | * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved. |
| 9 | * | 9 | * |
| 10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | * it under the terms of version 2 of the GNU General Public License as | 11 | * it under the terms of version 2 of the GNU General Public License as |
| @@ -30,7 +30,7 @@ | |||
| 30 | * | 30 | * |
| 31 | * BSD LICENSE | 31 | * BSD LICENSE |
| 32 | * | 32 | * |
| 33 | * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved. | 33 | * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved. |
| 34 | * All rights reserved. | 34 | * All rights reserved. |
| 35 | * | 35 | * |
| 36 | * Redistribution and use in source and binary forms, with or without | 36 | * Redistribution and use in source and binary forms, with or without |