diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-17 16:57:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-17 16:57:35 +1100 |
| commit | 0ff2d19d39f29acf6a8c86f9e5bb8aaf4fe4d95e (patch) | |
| tree | 0f833d94252d7eda983da632917b104616e16037 /drivers/net/wireless/iwlwifi/iwl-prph.h | |
| parent | 8757b299262f0e87f62480657f64d954967b1630 (diff) | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
Merge commit 'wireless/master'
Conflicts:
MAINTAINERS
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-prph.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-prph.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h index 4ba121634877..ecf651ae2593 100644 --- a/drivers/net/wireless/iwlwifi/iwl-prph.h +++ b/drivers/net/wireless/iwlwifi/iwl-prph.h @@ -5,7 +5,7 @@ * * GPL LICENSE SUMMARY * - * Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved. + * Copyright(c) 2005 - 2008 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 - 2007 Intel Corporation. All rights reserved. + * Copyright(c) 2005 - 2008 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |