summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/dvm/agn.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-11 18:44:25 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-02-11 18:44:25 +0100
commit78f42aee884dedfd157f79d01f069550edbc95cf (patch)
tree1f0b6a91c06cae83a647a076377d3279f7a9fb78 /drivers/net/wireless/iwlwifi/dvm/agn.h
parentaa5a1b8e68c95151fd249a3b5ec444c6b0aa2f1c (diff)
parent8708aac79e4572ba673d7a21e94ddca9f3abb7fc (diff)
Merge remote-tracking branch 'wireless-next/master' into HEAD
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/agn.h')
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/agn.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h
index 33b3ad2e546..f41ae79e6bc 100644
--- a/drivers/net/wireless/iwlwifi/dvm/agn.h
+++ b/drivers/net/wireless/iwlwifi/dvm/agn.h
@@ -5,7 +5,7 @@
*
* GPL LICENSE SUMMARY
*
- * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2013 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) 2005 - 2012 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without