diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:36:39 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:36:39 -0500 |
| commit | 97bae8dc961f59e81e85c7f92ff04f5ff73c20e8 (patch) | |
| tree | 4b1d350e36c76cf1d1665292976af8cc10d57e4c /drivers/net/wireless/i82593.h | |
| parent | 15d014d13149aedd76cbff1b5c3bbfe839391457 (diff) | |
| parent | cea00da3972806d213a7dbe1b98e889435385e6b (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/wireless/i82593.h')
| -rw-r--r-- | drivers/net/wireless/i82593.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/wireless/i82593.h b/drivers/net/wireless/i82593.h index 33acb8add4d6..afac5c7a323d 100644 --- a/drivers/net/wireless/i82593.h +++ b/drivers/net/wireless/i82593.h | |||
| @@ -7,11 +7,16 @@ | |||
| 7 | * | 7 | * |
| 8 | * Copyright 1994, Anders Klemets <klemets@it.kth.se> | 8 | * Copyright 1994, Anders Klemets <klemets@it.kth.se> |
| 9 | * | 9 | * |
| 10 | * This software may be freely distributed for noncommercial purposes | ||
| 11 | * as long as this notice is retained. | ||
| 12 | * | ||
| 13 | * HISTORY | 10 | * HISTORY |
| 14 | * i82593.h,v | 11 | * i82593.h,v |
| 12 | * Revision 1.4 2005/11/4 09:15:00 baroniunas | ||
| 13 | * Modified copyright with permission of author as follows: | ||
| 14 | * | ||
| 15 | * "If I82539.H is the only file with my copyright statement | ||
| 16 | * that is included in the Source Forge project, then you have | ||
| 17 | * my approval to change the copyright statement to be a GPL | ||
| 18 | * license, in the way you proposed on October 10." | ||
| 19 | * | ||
| 15 | * Revision 1.1 1996/07/17 15:23:12 root | 20 | * Revision 1.1 1996/07/17 15:23:12 root |
| 16 | * Initial revision | 21 | * Initial revision |
| 17 | * | 22 | * |